]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorMichael Wallner <mike@php.net>
Wed, 30 Apr 2014 11:02:43 +0000 (13:02 +0200)
committerMichael Wallner <mike@php.net>
Wed, 30 Apr 2014 11:02:43 +0000 (13:02 +0200)
commit42fbb952d77a53ce8995061b64e5f7c4bcef94af
tree8b2458573f1efd83b0641cf2c0f1b01150a35b26
parentaaad7ead55c33688156ad1cd85412041eadf0628
parentb79301d11f0fafe34a54cfc117fbe6bd00f52032
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix test locality inconsitency