From: Dan Brown <redacted>
Date: Wed, 14 Oct 2015 21:13:08 +0000 (+0100)
Subject: Merge branch 'master' of github.com:ssddanbrown/BookStack
X-Git-Tag: v0.5.0~24
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/68a149109abaced306116939a279c0cfc299dabd

Merge branch 'master' of github.com:ssddanbrown/BookStack
---

68a149109abaced306116939a279c0cfc299dabd