From: Stanislav Malyshev <stas@php.net>
Date: Wed, 19 Jun 2013 05:59:26 +0000 (-0700)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0~10
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=59d4d41efbe1a542afe21506b91936f2518cd364;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  5.4.18 next

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

59d4d41efbe1a542afe21506b91936f2518cd364