From: Dan Brown <redacted>
Date: Wed, 16 Dec 2015 17:29:34 +0000 (+0000)
Subject: Merge branch 'master' into release
X-Git-Tag: v0.6.0
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/refs/tags/v0.6.0

Merge branch 'master' into release
---

a91d42634d3a8eeb804c1818c10fbdce8b0beec7