Merge remote-tracking branch 'chinesization/master'

This commit is contained in:
东方孤思子(Paris·QianSen)
2014-06-19 19:42:55 +08:00