add weather support module
support captcha
pep8 style fix
Merge branch 'master' of git://github.com/wong2/xiaohuangji into root-repo
use pid to distinguish icodes; remove icode file after login
添加pull request说明
考虑没有settings.py的情况
copyright info. (following format of controller.py)
GUI监控
超时
Merge pull request #11 from hupili/master

Saving Captcha Locally and Input From Console
删掉几句注释掉的代码
合并插件机制到主干
让simsimi可测
修复在评论里被@时回复错误的问题
add renren pro
地震
Merge branch 'master' of github.com:wong2/xiaohuangji
地震更多关键词
Merge branch 'master' of github.com:wong2/xiaohuangji