]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4'
authorAnatoliy Belsky <ab@php.net>
Fri, 13 Jul 2012 09:46:49 +0000 (11:46 +0200)
committerAnatoliy Belsky <ab@php.net>
Fri, 13 Jul 2012 09:46:49 +0000 (11:46 +0200)
* PHP-5.4:
  Fixed bug #61677 ext\zlib\tests\bug_52944.phpt fails


Trivial merge