From: Christopher Jones <sixd@php.net>
Date: Thu, 1 Aug 2013 15:49:19 +0000 (-0700)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~360
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1c91ca990ff673edf8aa521285986759996f0cca;p=php

Merge branch 'PHP-5.5'

* PHP-5.5:
  Revert "Allow 'make distclean' to clean up the 'generated' phar.inc"
---

1c91ca990ff673edf8aa521285986759996f0cca