From: Xinchen Hui <laruence@gmail.com>
Date: Thu, 17 Mar 2016 13:27:23 +0000 (+0800)
Subject: Merge branch 'PHP-5.6' of git.php.net:/php-src into PHP-5.6
X-Git-Tag: php-5.6.21RC1~33
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=eb405623ec01d61ea34f5fb1d4c6f39c4eb187aa;p=php

Merge branch 'PHP-5.6' of git.php.net:/php-src into PHP-5.6

* 'PHP-5.6' of git.php.net:/php-src:
  fix NEWS
  NEWS
  Fix Bug #63171 	Script hangs after max_execution_time
---

eb405623ec01d61ea34f5fb1d4c6f39c4eb187aa