]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorMichael Wallner <mike@php.net>
Thu, 12 Dec 2013 11:09:34 +0000 (12:09 +0100)
committerMichael Wallner <mike@php.net>
Thu, 12 Dec 2013 11:09:34 +0000 (12:09 +0100)
commit8ee6fe9856cad30d01d6c8e3b5574dfc502bbfc6
treea1c506716205fb1f695804358bcfb9e212e23e45
parentda62fd5ed824bafc4dc3e90278c3d57d8e74cbe1
parentc59f3184a31c0e82d68c5823534e19aef78d9bf1
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix test