update
Merge branch 'master' of github.com:zjwangmin/weixin