From: Dan Brown <redacted>
Date: Sat, 2 Jan 2016 14:51:36 +0000 (+0000)
Subject: Merge branch 'master' of github.com:ssddanbrown/BookStack
X-Git-Tag: v0.7.0~1^2~10
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/d6739c1158e486b02885cd010f70ab4494a0404c

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

d6739c1158e486b02885cd010f70ab4494a0404c