From: Anatoliy Belsky <ab@php.net>
Date: Wed, 9 May 2012 11:06:47 +0000 (+0200)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~215
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e3f2c769899b77cb30153a235ea65ede9483bd13;p=php

Merge branch 'PHP-5.4'

* PHP-5.4:
  Fix bug 61901 ext\phar\tests\phar_buildfromdirectory2.phpt fails
---

e3f2c769899b77cb30153a235ea65ede9483bd13