]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorAnatol Belski <ab@php.net>
Mon, 29 Sep 2014 16:12:56 +0000 (18:12 +0200)
committerAnatol Belski <ab@php.net>
Mon, 29 Sep 2014 16:12:56 +0000 (18:12 +0200)
* PHP-5.5:
  fix tests on linux
  better test cleanup


Trivial merge