]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorPopa Adrian Marius <mapopa@reea.net>
Mon, 28 Apr 2014 09:14:01 +0000 (12:14 +0300)
committerPopa Adrian Marius <mapopa@reea.net>
Mon, 28 Apr 2014 09:14:01 +0000 (12:14 +0300)
* PHP-5.5:
  Cleanup ZEND_MODULE_API_NO => 20050922


Trivial merge