From: Tim Düsterhus <duesterhus@woltlab.com>
Date: Sat, 25 Jul 2015 15:15:50 +0000 (+0200)
Subject: Merge branch 'emails' into next
X-Git-Tag: 3.0.0_Beta_1~2166
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f3f95365958b65384f2febb96120d2e855da2dd9;p=GitHub%2FWoltLab%2FWCF.git

Merge branch 'emails' into next
---

f3f95365958b65384f2febb96120d2e855da2dd9