]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.3' into PHP-5.4
authorJohannes Schlüter <johannes@php.net>
Wed, 30 Jan 2013 23:58:52 +0000 (00:58 +0100)
committerJohannes Schlüter <johannes@php.net>
Wed, 30 Jan 2013 23:58:52 +0000 (00:58 +0100)
commit9d6636364dd002734b67efe2b2c08b954b650a99
tree8100276b4f712559738e1cd1ff589c629b793475
parent836a2b1131dd007edad24d921dbdf42a8ac10e32
parenta80fdc47b3b5046188aee6a9ef310879322cf4e9
Merge branch 'PHP-5.3' into PHP-5.4

Conflicts:
configure.in
main/php_version.h