From: Joe Watkins Date: Mon, 9 Jan 2017 15:58:09 +0000 (+0000) Subject: Merge branch 'PHP-7.0' into PHP-7.1 X-Git-Tag: php-7.1.2RC1~106 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2992f4164dad208fb539d18264a851a3af83dfe8;p=php Merge branch 'PHP-7.0' into PHP-7.1 * PHP-7.0: fix stub to accept user properly --- 2992f4164dad208fb539d18264a851a3af83dfe8