From: Anatoliy Belsky <ab@php.net>
Date: Mon, 7 May 2012 13:40:48 +0000 (+0200)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~229
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2c505ecc57092cac1cd554fd0f645c5f05db9f65;p=php

Merge branch 'PHP-5.4'

* PHP-5.4:
  Fix bug 61905 ext\phar\tests\zip\phar_commitwrite.phpt fails
  Fix bug 61903 ext\phar\tests\tar\phar_commitwrite.phpt fails
---

2c505ecc57092cac1cd554fd0f645c5f05db9f65