From: Dan Brown <redacted>
Date: Sat, 2 Jan 2016 14:49:05 +0000 (+0000)
Subject: Merge branch 'master' into release
X-Git-Tag: v0.6.3~1
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/4fc75beed4663abd2ca077cc8aa26f36e9b793c9

Merge branch 'master' into release
---

4fc75beed4663abd2ca077cc8aa26f36e9b793c9