From: Dan Brown <redacted>
Date: Wed, 16 Dec 2015 17:21:21 +0000 (+0000)
Subject: Merge branch 'master' into release
X-Git-Tag: v0.6.0~2
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/e99507ddcfe6867d8cc8be51e89353c249d3be6e

Merge branch 'master' into release
---

e99507ddcfe6867d8cc8be51e89353c249d3be6e