Commit: 1ce5a225899c19b79c64451e830cd3940ee2bff3 Author: Gustavo Lopes <gust...@icemobile.com> Mon, 14 Jan 2013 17:19:23 +0100 Parents: be07f815f240803fe7a48a5fb3d68a169bef4707 200242595dabfdaf6093da3e9ae6fef246ea8906 Branches: PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=1ce5a225899c19b79c64451e830cd3940ee2bff3 Log: Merge branch 'PHP-5.4' into PHP-5.5 Conflicts: NEWS Changed paths: MM ext/standard/string.c Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
