From: Dan Brown <redacted>
Date: Sun, 13 Mar 2016 15:13:23 +0000 (+0000)
Subject: Merge branch 'master' into release
X-Git-Tag: v0.8.0~1
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/1778a56146073bb0ccb6a0e164b644bab8256260

Merge branch 'master' into release
---

1778a56146073bb0ccb6a0e164b644bab8256260