]> granicus.if.org Git - php/commit
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)
commit969e3891216b543414c4931957069bdd9fa7f6cf
tree14c0d1506bfaebc2000345ad58b3d4e8f7f48c4e
parent263fb375bdec5f4c9595dd95b091d0f2353e72c0
parent0bfcc2829c8e0055787633b1afb9779753175594
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix sizeof size
ext/mysqlnd/mysqlnd_result.c