]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4'
authorAnatoliy Belsky <ab@php.net>
Mon, 7 May 2012 13:40:48 +0000 (15:40 +0200)
committerAnatoliy Belsky <ab@php.net>
Mon, 7 May 2012 13:40:48 +0000 (15:40 +0200)
* PHP-5.4:
  Fix bug 61905 ext\phar\tests\zip\phar_commitwrite.phpt fails
  Fix bug 61903 ext\phar\tests\tar\phar_commitwrite.phpt fails


Trivial merge