From: Stanislav Malyshev <stas@php.net>
Date: Sun, 11 Aug 2013 08:37:44 +0000 (-0700)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~308
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6e92f07926c4bd39f263e913b55ed27a2d27d875;p=php

Merge branch 'PHP-5.5'

* PHP-5.5:
  use mysqlnd, some tests fail otherwise
---

6e92f07926c4bd39f263e913b55ed27a2d27d875