mirror of
https://github.com/php/php-src.git
synced 2024-09-26 20:37:29 +00:00
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4: 5.4.27 now update NEWS Conflicts: configure.in main/php_version.h
This commit is contained in:
commit
58b7f21c3f