From: Stanislav Malyshev <stas@php.net>
Date: Wed, 9 Jul 2014 04:41:06 +0000 (-0700)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.17RC1~56
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=393bf0e4bb30f357cd2512953cfdb8591522c9a9;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  5.4.31
  fix unstable test

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

393bf0e4bb30f357cd2512953cfdb8591522c9a9