From: Dan Brown <redacted>
Date: Thu, 25 Feb 2016 21:23:06 +0000 (+0000)
Subject: Merge branch 'master' into release
X-Git-Tag: v0.7.5~1
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/14b131e850b1f73e1c32122d8f10476bc4b310f0

Merge branch 'master' into release
---

14b131e850b1f73e1c32122d8f10476bc4b310f0