]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorJohannes Schlüter <johannes@php.net>
Tue, 21 Jan 2014 15:37:02 +0000 (16:37 +0100)
committerJohannes Schlüter <johannes@php.net>
Tue, 21 Jan 2014 15:37:02 +0000 (16:37 +0100)
1  2 
ext/mysqlnd/mysqlnd_result.c

Simple merge