wong2/xiaohuangji — pull request #28 by HQMIS (2013-01-13 17:58:16+00:00)
Title: New Feature： keyword

1、joke、story、knowledge
2、change weather.py -- add 钓鱼岛， use two file save city， in order to make verify faster