mirror of
https://github.com/php/php-src.git
synced 2024-12-03 06:44:07 +08:00
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4: update news Conflicts: ext/standard/crypt.c
This commit is contained in:
commit
f7eedbe9a6