From: Dan Brown <redacted>
Date: Sun, 13 Mar 2016 15:38:06 +0000 (+0000)
Subject: Merge branch 'master' into release
X-Git-Tag: v0.8.1
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/1fe933e4eaa07b8eced9911440dd61dd60ef3a2f

Merge branch 'master' into release
---

1fe933e4eaa07b8eced9911440dd61dd60ef3a2f