From: Xinchen Hui <laruence@gmail.com>
Date: Mon, 16 Nov 2015 09:00:16 +0000 (+0800)
Subject: Merge branch 'PHP-5.6' of git.php.net:/php-src into PHP-5.6
X-Git-Tag: php-5.6.17RC1~29
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=25439e939e8d6a86bcc1654221460851b43271d5;p=php

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

25439e939e8d6a86bcc1654221460851b43271d5