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

Merge branch 'PHP-5.5'

* PHP-5.5:
  Clean up the 'generated' phar.inc file. When building outside the source tree the copied phar.inc needs to be removed, but when building in the tree, the file must remain since it is part of the source. See the copying logic in ext/phar/Makefile.frag.
---

9cd1ac7b61a473232d867c3eb69bfb8525f0d951