]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorAnatol Belski <ab@php.net>
Mon, 5 Jan 2015 18:20:07 +0000 (19:20 +0100)
committerAnatol Belski <ab@php.net>
Mon, 5 Jan 2015 18:20:07 +0000 (19:20 +0100)
* PHP-5.5:
  fix ACLs tests, make it create dir where it has to, not file


Trivial merge