]> granicus.if.org Git - php/commit
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)
commit5bbc489527d9a762fa98cffb353f007d60090a3c
treeb3bf9d9d23dc26ce10deaeef2b93f1f24dd6f3eb
parent26e492f2f3d3e26f7320957172e37ee49f6e6112
parent64c09f68ec66061d1085ad5a5ef0a5ced63450b6
Merge branch 'PHP-5.3' into PHP-5.4

Conflicts:
configure.in
main/php_version.h