From: Dan Brown <redacted>
Date: Sun, 6 Mar 2016 13:26:29 +0000 (+0000)
Subject: Merged branch master into release
X-Git-Tag: v0.7.6~1
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/7f8c8b448d11e957e09a830932d461540716b229

Merged branch master into release
---

7f8c8b448d11e957e09a830932d461540716b229