]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Wed, 5 Dec 2012 05:33:31 +0000 (21:33 -0800)
committerStanislav Malyshev <stas@php.net>
Wed, 5 Dec 2012 05:33:31 +0000 (21:33 -0800)
commit16b1d45e6935faef042c73439497b481db2307c6
tree08011460d507151055783ef7be7d6aafe0cacfb7
parent266059d6f05faa23abaa8da05f70f9830b8ad9ca
parentc3b6f6feed6ba4af04a90785988a104cd3ff1e54
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  5.4.11-dev

Conflicts:
configure.in
main/php_version.h