From: Christopher Jones <sixd@php.net>
Date: Mon, 8 Jul 2013 20:31:12 +0000 (-0700)
Subject: Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
X-Git-Tag: php-5.6.0alpha1~383^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ac26d0e6558f3c7e8c555feb0511867da5984344;p=php

Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5

* 'PHP-5.5' of https://git.php.net/repository/php-src:
  Fixed segfault in mysqlnd when doing long prepare
---

ac26d0e6558f3c7e8c555feb0511867da5984344