Merge branch 'master' of github.com:dianping/cat
Merge branch 'master' of github.com:dianping/cat
Merge pull request #49 from youyong205/master

add code fomat