From: Tim Düsterhus <duesterhus@woltlab.com>
Date: Thu, 6 Aug 2015 19:26:18 +0000 (+0200)
Subject: Merge commit '681d8a' into next
X-Git-Tag: 3.0.0_Beta_1~2145
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=5259e5f8e4a867bf5ab0c3ad6487f4f745425eff;p=GitHub%2FWoltLab%2FWCF.git

Merge commit '681d8a' into next
---

5259e5f8e4a867bf5ab0c3ad6487f4f745425eff