]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4'
authorAnatoliy Belsky <ab@php.net>
Mon, 16 Apr 2012 12:06:03 +0000 (14:06 +0200)
committerAnatoliy Belsky <ab@php.net>
Mon, 16 Apr 2012 12:06:03 +0000 (14:06 +0200)
* PHP-5.4:
  Fix bug 61680 ext\zlib\tests\gzencode_variation1-win32.phpt fails


Trivial merge