]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.3' into PHP-5.4
authorAnatoliy Belsky <ab@php.net>
Thu, 26 Apr 2012 13:17:46 +0000 (15:17 +0200)
committerAnatoliy Belsky <ab@php.net>
Thu, 26 Apr 2012 13:17:46 +0000 (15:17 +0200)
commit94d96f77826e46f114d4bc1777e1edcdfef002a2
tree1dc830f7292ff5a2af6bb263bc5243bd4c42cb00
parent19df3c1b1c3bcb120ba63d3537e7177b8826fb96
parent4daab0abecd5ee583c005d8e7b6affc08af8639d
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fix bug #61791 ext\sqlite3\tests\sqlite3_15_open_error.phpt fails

Conflicts:
ext/sqlite3/tests/sqlite3_15_open_error.phpt
ext/sqlite3/tests/sqlite3_15_open_error.phpt