From: Anatoliy Belsky <ab@php.net>
Date: Wed, 28 Mar 2012 10:56:17 +0000 (+0200)
Subject: Merge branch 'PHP-5.3' into PHP-5.4
X-Git-Tag: php-5.4.1RC1~10
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d406f2b034a3b41e94aaf7bea0535aca196853d7;p=php

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fix bug #61468 ext/phar/tests/phar_oo_005.phpt fails
---

d406f2b034a3b41e94aaf7bea0535aca196853d7