lyndsysimon/osf.io — pull request #1 by sloria (2014-12-19 15:26:32+00:00)
Title: Lyndsysimon feature/mako html safety

Syncs with develop and resolves merge conflicts