Merge pull request #5114 from anshao/master
authorCheng Zhao <zcbenz@gmail.com>
Tue, 12 Apr 2016 05:02:23 +0000 (14:02 +0900)
committerCheng Zhao <zcbenz@gmail.com>
Tue, 12 Apr 2016 05:02:23 +0000 (14:02 +0900)
Delete the extra text


Trivial merge