]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.3' into PHP-5.4
authorJohannes Schlüter <johannes@php.net>
Wed, 16 May 2012 14:50:33 +0000 (16:50 +0200)
committerJohannes Schlüter <johannes@php.net>
Wed, 16 May 2012 14:50:33 +0000 (16:50 +0200)
commit89e7a195bc44b60db08646b724da24fe7b90a610
tree37fcf7af24032ce6e36840bb08866fe4b83e9534
parent1f6f6194517b25fea8ed2e0c5c8b0d2e5ae07c1d
parent72a9b595ca3e1bc07cf1aa51c91dcbc973f89d10
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  PHP 5.3.15-dev

Conflicts:
configure.in
main/php_version.h