From: Stanislav Malyshev <stas@php.net>
Date: Wed, 17 Jul 2013 20:52:25 +0000 (-0700)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.1~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fec93992de67a3bc30559e0a741b6ca5e0db8025;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  5.4.19 is next

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

fec93992de67a3bc30559e0a741b6ca5e0db8025