martinglover/site-build — pull request #7 by mattcockayne (2014-07-17 20:19:08+00:00)
Title: Pull request to fix merge inconsistencies

Pull request to fix merge inconsistencies between zucchi and martinglover repos