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

Merge branch 'PHP-5.4'

* PHP-5.4:
  Fix bug #61904 ext\phar\tests\tar\phar_setsignaturealgo2.phpt
  Bump to next version

Conflicts:
	configure.in
	main/php_version.h
---

7388c085bf6ed2d8b712990f31aa30191e969bde