From: Stanislav Malyshev <stas@php.net>
Date: Wed, 27 Feb 2013 06:26:36 +0000 (-0800)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0alpha6~32
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0d65a85cc0b1c789ad70e32c97a2a82064d80a9f;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  5.4.13 branched, now it's 5.4.14

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

0d65a85cc0b1c789ad70e32c97a2a82064d80a9f