From: Tim Düsterhus <duesterhus@woltlab.com>
Date: Tue, 23 Jun 2015 22:32:36 +0000 (+0200)
Subject: Merge branch 'email' into next
X-Git-Tag: 3.0.0_Beta_1~2249^2~2
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7a7c9ea47e437ade552cf31610d17b3e6714a2e9;p=GitHub%2FWoltLab%2FWCF.git

Merge branch 'email' into next
---

7a7c9ea47e437ade552cf31610d17b3e6714a2e9