From: Anatoliy Belsky <ab@php.net>
Date: Fri, 4 May 2012 09:42:28 +0000 (+0200)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~232^2~7
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=56ac0e71bbcc593dd3893b7986e51698bc18e38e;p=php

Merge branch 'PHP-5.4'

* PHP-5.4:
  Fix bug #61906 ext\phar\tests\zip\phar_setsignaturealgo2.phpt fails
---

56ac0e71bbcc593dd3893b7986e51698bc18e38e