]> 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:06:39 +0000 (14:06 +0100)
committerMichael Wallner <mike@php.net>
Wed, 18 Feb 2015 13:06:39 +0000 (14:06 +0100)
commitec7ba48e678e3463a2344bf89ce340dfb836add6
tree888e4123d529ab7d3d7707b3c431b9047121e475
parent23e4af185adcb6d116ee0897002c09c6603634ae
parent83dda66aac10e7307f2e2f4e73a769b125a88451
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix test