]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorJohannes Schlüter <johannes@php.net>
Wed, 3 Jul 2013 15:10:58 +0000 (17:10 +0200)
committerJohannes Schlüter <johannes@php.net>
Wed, 3 Jul 2013 15:10:58 +0000 (17:10 +0200)
commit9aa7343ae0828d881e8438a5a9146fd4a95a93d9
treee29e46161f7df8960646d2db8c59377937f60216
parent631bb27dcacf625e35f6dacc5e8df0b45624531a
parent5bc7e597d990eb3c38d07c0189d27c246c7b4ae5
Merge branch 'PHP-5.4' into PHP-5.5
ext/mysqlnd/mysqlnd.c