From: Stanislav Malyshev <stas@php.net>
Date: Wed, 24 Apr 2013 17:16:56 +0000 (-0700)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0beta4~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cf9db2154e3078060f7113d7e9bfeeaf985b94c8;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  5.4.16-dev

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

cf9db2154e3078060f7113d7e9bfeeaf985b94c8