Merge pull request #4291 from yamatoya/master
authorCheng Zhao <zcbenz@gmail.com>
Mon, 1 Feb 2016 05:11:01 +0000 (13:11 +0800)
committerCheng Zhao <zcbenz@gmail.com>
Mon, 1 Feb 2016 05:11:01 +0000 (13:11 +0800)
commite16154889a783ec4de3718106227fb12ff08740b
tree1c32516f1168215e26753057cabf7e7c76239401
parentea2f170b7d5e90f33fb6e0bf43de32e90fc28515
parent0f539adab9cbe507dcee291e6dfc821bafae83e9
Merge pull request #4291 from yamatoya/master

:memo: Update as upstream