From: Dan Brown <redacted>
Date: Fri, 15 Apr 2016 18:52:59 +0000 (+0100)
Subject: Merge branch 'master' into release
X-Git-Tag: v0.9.2~1
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/448ac61b48c557359e98d605ca0c6023d3f7b3c1

Merge branch 'master' into release
---

448ac61b48c557359e98d605ca0c6023d3f7b3c1