From: Christopher Jones <sixd@php.net>
Date: Wed, 2 Oct 2013 12:40:42 +0000 (-0700)
Subject: Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
X-Git-Tag: php-5.5.5~18
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6cd0bd82dc9812b8ff3644203830b2952b61df97;p=php

Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5

* 'PHP-5.5' of https://git.php.net/repository/php-src:
  Revert "Make 'make distclean' remove the downloaded pear PHAR"
  fix bug #62396 'make test' crashes starting with 5.3.14 (missing gzencode())
---

6cd0bd82dc9812b8ff3644203830b2952b61df97