com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/standard/string.c
| From: | Gustavo André dos Santos Lopes | Date: | Mon, 14 Jan 2013 16:19:23 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/standard/string.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-70989@lists.php.net to get a copy of this message | ||
Commit: 1ce5a225899c19b79c64451e830cd3940ee2bff3
Author: Gustavo Lopes <gustavo@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: