]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 09e73fd 30270af)
Merge branch 'PHP-5.5'
authorNikita Popov <nikic@php.net>
Wed, 30 Jan 2013 19:38:04 +0000 (20:38 +0100)
committerNikita Popov <nikic@php.net>
Wed, 30 Jan 2013 19:38:04 +0000 (20:38 +0100)
Conflicts:
configure.in
main/php_version.h


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