From: Anatoliy Belsky <ab@php.net>
Date: Mon, 16 Apr 2012 12:05:32 +0000 (+0200)
Subject: Merge branch 'PHP-5.3' into PHP-5.4
X-Git-Tag: php-5.4.4RC1~117
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d588d01b7c6583fc7da2dfbbc67d2beef1070ef4;p=php

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fix bug 61680 ext\zlib\tests\gzencode_variation1-win32.phpt fails
---

d588d01b7c6583fc7da2dfbbc67d2beef1070ef4