]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorStanislav Malyshev <stas@php.net>
Sun, 1 Feb 2015 20:41:33 +0000 (12:41 -0800)
committerStanislav Malyshev <stas@php.net>
Sun, 1 Feb 2015 20:41:33 +0000 (12:41 -0800)
* PHP-5.5:
  fix sizeof size

1  2 
ext/mysqlnd/mysqlnd_result.c

Simple merge