]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorMichael Wallner <mike@php.net>
Wed, 18 Feb 2015 13:05:02 +0000 (14:05 +0100)
committerMichael Wallner <mike@php.net>
Wed, 18 Feb 2015 13:05:02 +0000 (14:05 +0100)
commit23e4af185adcb6d116ee0897002c09c6603634ae
tree0d0594bfe1f9b13950c8abf5e34311c6365b7dc3
parent0d2a2b98c9e88e63e6a3496d6dbf2cc479684427
parent8b6919c77ccbfbf52dd97067e313c55dd39abbf5
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix test