WizardFactory/BlogSyncer — pull request #29 by kimalec (2014-09-04 11:37:19+00:00)
Title: 2 Merge branch 'master' of https://github.com/WizardFactory/BlogSyncer

2 Merge branch 'master' of https://github.com/WizardFactory/BlogSyncer

Conflicts:
routes/blogbot.js
routes/wordpress.js