]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorStanislav Malyshev <stas@php.net>
Wed, 20 Aug 2014 21:44:33 +0000 (14:44 -0700)
committerStanislav Malyshev <stas@php.net>
Wed, 20 Aug 2014 21:44:33 +0000 (14:44 -0700)
commit89d3a356d11aab0b1052cbdb036cede278a5eec2
tree7c8347ad27c6ec6d1894efb8806095f0ba037001
parent2dfabd8b5125f6b114ac43cc4850f1dffcb4af84
parent6da2a977fc9acc8463b61a0ce0acdead9c651084
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix test