]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4'
authorAnatoliy Belsky <ab@php.net>
Wed, 9 May 2012 11:06:47 +0000 (13:06 +0200)
committerAnatoliy Belsky <ab@php.net>
Wed, 9 May 2012 11:06:47 +0000 (13:06 +0200)
* PHP-5.4:
  Fix bug 61901 ext\phar\tests\phar_buildfromdirectory2.phpt fails


Trivial merge