]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 26e492f 64c09f6)
Merge branch 'PHP-5.3' into PHP-5.4
authorJohannes Schlüter <johannes@php.net>
Thu, 4 Oct 2012 00:37:04 +0000 (02:37 +0200)
committerJohannes Schlüter <johannes@php.net>
Thu, 4 Oct 2012 00:37:04 +0000 (02:37 +0200)
Conflicts:
configure.in
main/php_version.h


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