From: Dan Brown <redacted>
Date: Sun, 31 Jan 2016 18:01:25 +0000 (+0000)
Subject: Merge branch 'master' into release
X-Git-Tag: v0.7.0~1
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/56ae86646f7e3a1f9f2fa744e2923e52cbe78d06

Merge branch 'master' into release
---

56ae86646f7e3a1f9f2fa744e2923e52cbe78d06