Merge branch 'PHP-7.0'
authorXinchen Hui <laruence@gmail.com>
Tue, 29 Sep 2015 13:50:21 +0000 (21:50 +0800)
committerXinchen Hui <laruence@gmail.com>
Tue, 29 Sep 2015 13:50:21 +0000 (21:50 +0800)

Trivial merge