]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3e7fcd9 417b1b2)
Merge branch 'PHP-5.3' into PHP-5.4
authorJohannes Schlüter <johannes@php.net>
Wed, 7 Nov 2012 23:03:37 +0000 (00:03 +0100)
committerJohannes Schlüter <johannes@php.net>
Wed, 7 Nov 2012 23:03:37 +0000 (00:03 +0100)
Conflicts:
configure.in
main/php_version.h


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