From: Dan Brown <redacted>
Date: Thu, 11 Feb 2016 22:29:29 +0000 (+0000)
Subject: Merge branch 'master' into release
X-Git-Tag: v0.7.4~1
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/db1d10e80f5a3f1ffc0a01b7157f2b42e1a5ca1e

Merge branch 'master' into release
---

db1d10e80f5a3f1ffc0a01b7157f2b42e1a5ca1e