iss53
hotfix
resolve conflicts
Merge branch 'master' of github.com:hys/tanren
reset