]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Sun, 1 Feb 2015 20:41:00 +0000 (12:41 -0800)
committerStanislav Malyshev <stas@php.net>
Sun, 1 Feb 2015 20:41:00 +0000 (12:41 -0800)
commitf66f5b2ffa76901f62972905f9dd066c7a92b34f
tree9abd771dd56f8c52a89a086cc5d35bf4f244e1da
parent6a905a9a3cae60ffb22f7472d9fa977e54c24d5d
parent7efbd70b034890df171cc0c48363f99121f0c19e
Merge branch 'PHP-5.4' into PHP-5.5

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