From: Dan Brown <redacted>
Date: Sat, 4 Jun 2016 14:43:08 +0000 (+0100)
Subject: Merge branch 'master' of git://github.com/rovox/BookStack into rovox-master
X-Git-Tag: v0.11.0~1^2~13^2~1
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/5942d796b51ef9f565ebd88ebeabe40e1f078a47

Merge branch 'master' of git://github.com/rovox/BookStack into rovox-master
---

5942d796b51ef9f565ebd88ebeabe40e1f078a47