]> 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:43:22 +0000 (14:43 -0700)
committerStanislav Malyshev <stas@php.net>
Wed, 20 Aug 2014 21:43:22 +0000 (14:43 -0700)
commit2dfabd8b5125f6b114ac43cc4850f1dffcb4af84
tree7c8347ad27c6ec6d1894efb8806095f0ba037001
parent42e1df9b01fb47fb881d05d12d3887a1195729be
parent6424bf659dc912efba120ea58c04898adfa751f4
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix test