]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.3' into PHP-5.4
authorAnatoliy Belsky <ab@php.net>
Wed, 28 Mar 2012 10:56:17 +0000 (12:56 +0200)
committerAnatoliy Belsky <ab@php.net>
Wed, 28 Mar 2012 10:56:17 +0000 (12:56 +0200)
* PHP-5.3:
  Fix bug #61468 ext/phar/tests/phar_oo_005.phpt fails


Trivial merge