]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorStanislav Malyshev <stas@php.net>
Sun, 11 Aug 2013 08:37:44 +0000 (01:37 -0700)
committerStanislav Malyshev <stas@php.net>
Sun, 11 Aug 2013 08:37:44 +0000 (01:37 -0700)
* PHP-5.5:
  use mysqlnd, some tests fail otherwise


Trivial merge