deng_20140116
Merge branch 'master' of https://github.com/wxorg/wxchat