]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorMatteo Beccati <mbeccati@php.net>
Mon, 5 Jan 2015 11:11:46 +0000 (12:11 +0100)
committerMatteo Beccati <mbeccati@php.net>
Mon, 5 Jan 2015 11:11:46 +0000 (12:11 +0100)
commit38f1b569c27eef4d7edaca1bd70230f330a12b97
tree84674e13a9d5be252c8f2e867e4dac1a89c92f30
parente372e037dd60d7c94b9edf49337a3a0273284e3a
parentea1c0c56273c10362f33aa3270168f37a26c29d6
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Update test after fixing bug #68371