]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 836a2b1 a80fdc4)
Merge branch 'PHP-5.3' into PHP-5.4
authorJohannes Schlüter <johannes@php.net>
Wed, 30 Jan 2013 23:58:52 +0000 (00:58 +0100)
committerJohannes Schlüter <johannes@php.net>
Wed, 30 Jan 2013 23:58:52 +0000 (00:58 +0100)
Conflicts:
configure.in
main/php_version.h


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