]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e6a6a5d 637367f)
Merge branch 'PHP-5.5' into PHP-5.6
authorAndrey Hristov <andrey@php.net>
Wed, 6 Aug 2014 14:03:39 +0000 (17:03 +0300)
committerAndrey Hristov <andrey@php.net>
Wed, 6 Aug 2014 14:03:39 +0000 (17:03 +0300)
Conflicts:
NEWS
configure.in
main/php_version.h


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.