]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorMatteo Beccati <mbeccati@php.net>
Sun, 2 Jun 2013 11:39:38 +0000 (13:39 +0200)
committerMatteo Beccati <mbeccati@php.net>
Sun, 2 Jun 2013 11:39:38 +0000 (13:39 +0200)
* PHP-5.4:
  Clean up leftover test files
  Improved test portability so that it doesn't fail with pdo_pgsql
  Fix PDO::inTransaction() test for pgsql


Trivial merge