From: Christopher Jones <sixd@php.net>
Date: Wed, 2 Oct 2013 12:41:20 +0000 (-0700)
Subject: Merge branch 'master' of https://git.php.net/repository/php-src
X-Git-Tag: php-5.6.0alpha1~211^2~31^2~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=83955de57e62d20c2681733e03e3589ca513d77a;p=php

Merge branch 'master' of https://git.php.net/repository/php-src

* 'master' 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())
---

83955de57e62d20c2681733e03e3589ca513d77a