Merge branch 'master' of https://github.com/tmars/BlogTender
Merge branch 'master' of https://github.com/tmars/BlogTender