From: Dan Brown <redacted>
Date: Tue, 2 Feb 2016 07:35:20 +0000 (+0000)
Subject: Merge branch 'master' into release
X-Git-Tag: 0.7.2^0
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/8dec674cc3647a994509fdf4843b87f727fbfc3b

Merge branch 'master' into release
---

8dec674cc3647a994509fdf4843b87f727fbfc3b