From: Xinchen Hui <laruence@gmail.com>
Date: Fri, 9 Sep 2016 14:41:42 +0000 (+0800)
Subject: Merge branch 'master' of git.php.net:/php-src
X-Git-Tag: php-7.2.0alpha1~1303
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3a9d45a12bf300d575a436a5d90cd4dc4c5c0c4a;p=php

Merge branch 'master' of git.php.net:/php-src

* 'master' of git.php.net:/php-src:
---

3a9d45a12bf300d575a436a5d90cd4dc4c5c0c4a