]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.3' into PHP-5.4
authorJohannes Schlüter <johannes@php.net>
Wed, 5 Dec 2012 18:02:41 +0000 (19:02 +0100)
committerJohannes Schlüter <johannes@php.net>
Wed, 5 Dec 2012 18:02:41 +0000 (19:02 +0100)
commit811cd765a90f0d952b09947135275d7495e4e7a4
treea525e310a0d4001c6aad77dff1d5a6526284edea
parentdf97c3aa0d331be668bd5d8f27fff96d4e3ac1d7
parent22fe268ad4c22ec55bc2c74db18b3cae8f8a6176
Merge branch 'PHP-5.3' into PHP-5.4

Conflicts:
configure.in
main/php_version.h