com php-src: Merge branch 'PHP-5.3' into PHP-5.4: acinclude.m4
| From: | Moriyoshi Koizumi | Date: | Mon, 02 Apr 2012 17:00:23 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.3' into PHP-5.4: acinclude.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-68643@lists.php.net to get a copy of this message | ||
Commit: 43047598c4e4ed76daa82ff509e46c40087f0ea4
Author: Moriyoshi Koizumi <mozo@mozo.jp> Tue, 3 Apr 2012 02:00:23 +0900
Parents: 374646c36b07956da928e0583854002e55b4013e a6c95c8a00e9286ccc662e9682f9254e153d6833
Branches: PHP-5.4 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=43047598c4e4ed76daa82ff509e46c40087f0ea4
Log:
Merge branch 'PHP-5.3' into PHP-5.4
Conflicts:
NEWS
Changed paths:
MM acinclude.m4
Diff: