Merge branch 'PHP-7.0'
authorXinchen Hui <laruence@gmail.com>
Thu, 26 Nov 2015 04:00:37 +0000 (12:00 +0800)
committerXinchen Hui <laruence@gmail.com>
Thu, 26 Nov 2015 04:00:37 +0000 (12:00 +0800)

Trivial merge