字符集文章
Merge pull request #1 from acmerfight/master

sync