]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorStanislav Malyshev <stas@php.net>
Sun, 1 Feb 2015 20:42:00 +0000 (12:42 -0800)
committerStanislav Malyshev <stas@php.net>
Sun, 1 Feb 2015 20:42:00 +0000 (12:42 -0800)
commitbf55a4e22378f8a6518fa33f0c2d76f82f5e182b
tree48b77e58a0e320469ff1622c7f9b3749323cc9fe
parent437719f7ccafabfe67993a1201d0e2562826376f
parent969e3891216b543414c4931957069bdd9fa7f6cf
Merge branch 'PHP-5.6'

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