From: Anatoliy Belsky <ab@php.net>
Date: Fri, 13 Jul 2012 09:46:49 +0000 (+0200)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~83
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=92bf6391aae5bbbe6a1202cae20dd1d5e13f0871;p=php

Merge branch 'PHP-5.4'

* PHP-5.4:
  Fixed bug #61677 ext\zlib\tests\bug_52944.phpt fails
---

92bf6391aae5bbbe6a1202cae20dd1d5e13f0871