From: Stanislav Malyshev <stas@php.net>
Date: Wed, 25 Dec 2013 06:23:24 +0000 (-0800)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.6.0alpha1~87^2^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a2503c6af38d5a2de172a9a746719c4b12b53034;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  5.4.25 next

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

a2503c6af38d5a2de172a9a746719c4b12b53034