]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.3' into PHP-5.4
authorPopa Adrian Marius <mapopa@reea.net>
Mon, 28 Apr 2014 09:13:11 +0000 (12:13 +0300)
committerPopa Adrian Marius <mapopa@reea.net>
Mon, 28 Apr 2014 09:13:11 +0000 (12:13 +0300)
commitbb422cb60e69794b3ea9d7d47fcc8a976a385608
tree6aaad65d2399d8a5515e24351478cb154992d3f3
parentd3dcd616231e6eda97a7b474bbd585a7f61f0b71
parentdbcd6304bb2dc5bdab4d25c7fac8e578354ed2d9
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Cleanup ZEND_MODULE_API_NO => 20050922
ext/pdo_firebird/firebird_driver.c
ext/pdo_firebird/pdo_firebird.c