]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.3' into PHP-5.4
authorChristopher Jones <sixd@php.net>
Thu, 3 May 2012 19:22:39 +0000 (12:22 -0700)
committerChristopher Jones <sixd@php.net>
Thu, 3 May 2012 19:22:39 +0000 (12:22 -0700)
commit31ab04ee25bc9d4edfa524c2a11a33f8cbc8d1b6
tree52a399b87ca2e62fc805747442f39d28a35535bf
parent72f19e9a8bcf5712b24fa333a26616eff19ac1ce
parent0956c00af999c295c5a13644ec835da8f96ad48d
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Bump to next version

Conflicts:
configure.in
main/php_version.h
configure.in
main/php_version.h