From: Dan Brown <redacted>
Date: Sat, 9 Apr 2016 14:47:14 +0000 (+0100)
Subject: Merge branch 'master' into release
X-Git-Tag: v0.9.0~1
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/09f478bd74dc5924c2fd4520d30db67593a62194

Merge branch 'master' into release
---

09f478bd74dc5924c2fd4520d30db67593a62194