]> granicus.if.org Git - php/commitdiff
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)
* PHP-5.5:
  fix test locality inconsitency


Trivial merge