From: Andrey Hristov <andrey@php.net>
Date: Wed, 6 Aug 2014 14:03:39 +0000 (+0300)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.0RC4~1^2~17
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=847c65e9672072fd772d08a78d653b6142b6c4f0;p=php

Merge branch 'PHP-5.5' into PHP-5.6

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

847c65e9672072fd772d08a78d653b6142b6c4f0