From: Xinchen Hui Date: Wed, 21 Dec 2016 06:27:13 +0000 (+0800) Subject: Merge branch 'PHP-7.1' X-Git-Tag: php-7.2.0alpha1~774 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b6553d422d51ea7d10c3ea56c1e4a632ff6ba4eb;p=php Merge branch 'PHP-7.1' * PHP-7.1: Revert "Reorder the oplines" (Break Zend/tests/return_types/bug71092.phpt) --- b6553d422d51ea7d10c3ea56c1e4a632ff6ba4eb