]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorStanislav Malyshev <stas@php.net>
Mon, 17 Jun 2013 07:42:36 +0000 (00:42 -0700)
committerStanislav Malyshev <stas@php.net>
Mon, 17 Jun 2013 07:42:36 +0000 (00:42 -0700)
* PHP-5.5:
  Tests: PDO Mysql - update for fixed getColumnMeta()
  fix bug #48724


Trivial merge