]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.3' into PHP-5.4
authorAnatoliy Belsky <ab@php.net>
Fri, 4 May 2012 09:42:05 +0000 (11:42 +0200)
committerAnatoliy Belsky <ab@php.net>
Fri, 4 May 2012 09:42:05 +0000 (11:42 +0200)
* PHP-5.3:
  Fix bug #61906 ext\phar\tests\zip\phar_setsignaturealgo2.phpt fails


Trivial merge