Merge pull request #4821 from yucheng-inc/master
authorCheng Zhao <zcbenz@gmail.com>
Thu, 17 Mar 2016 13:55:01 +0000 (22:55 +0900)
committerCheng Zhao <zcbenz@gmail.com>
Thu, 17 Mar 2016 13:55:01 +0000 (22:55 +0900)
translations   zh-CN    doc


Trivial merge