From: Matthias Schmidt <gravatronics@live.com>
Date: Mon, 21 Dec 2015 16:27:22 +0000 (+0100)
Subject: Merge branch 'master' into next
X-Git-Tag: 3.0.0_Beta_1~157
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e27c5511de8826d542fb998ea91a68795fbf2218;p=GitHub%2FWoltLab%2Fcom.woltlab.wcf.conversation.git

Merge branch 'master' into next
---

e27c5511de8826d542fb998ea91a68795fbf2218