]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e4a28b7 2c3f6dc)
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
authorChristopher Jones <sixd@php.net>
Mon, 8 Jul 2013 20:30:54 +0000 (13:30 -0700)
committerChristopher Jones <sixd@php.net>
Mon, 8 Jul 2013 20:30:54 +0000 (13:30 -0700)
* 'PHP-5.4' of https://git.php.net/repository/php-src:
  Fixed segfault in mysqlnd when doing long prepare


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.