From: Stanislav Malyshev <stas@php.net>
Date: Tue, 2 Sep 2014 22:03:54 +0000 (-0700)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.17RC1~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a734acd4398abcbf6130b3d091bcb8a6ce7ec70d;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  5.4.34 is next

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

a734acd4398abcbf6130b3d091bcb8a6ce7ec70d