From: Dan Brown <redacted>
Date: Mon, 1 Feb 2016 18:31:04 +0000 (+0000)
Subject: Merge branch 'master' into release
X-Git-Tag: v.0.7.1
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/refs/tags/v.0.7.1

Merge branch 'master' into release
---

f784c03746eaf649142fcdd311de439952e9233e