save before pull
Merge branch 'master' of https://github.com/dianping/cat
fix bug after weiwei push
delete garbage content
Merge pull request #290 from jialinsun/master

fix bug after merge weiwei's code