From: Sebastian Reese <redacted>
Date: Wed, 1 Feb 2017 23:43:54 +0000 (+0100)
Subject: Merge branch 'master' of https://github.com/BookStackApp/BookStack
X-Git-Tag: v0.15.0~1^2~9^2
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/refs/pull/295/head?hp=-c

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

54d1fcde5b72fb4653c003a79205bc077472b64c