From: Dan Brown <redacted>
Date: Tue, 12 Apr 2016 19:09:14 +0000 (+0100)
Subject: Merge branch 'master' into release
X-Git-Tag: v0.9.1
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/753f6394f7110eb18b5b85a87319c4324f816cd0

Merge branch 'master' into release
---

753f6394f7110eb18b5b85a87319c4324f816cd0