Merge branch 'email-notification' into email-use
authorTim Düsterhus <duesterhus@woltlab.com>
Fri, 29 Jul 2016 14:26:54 +0000 (16:26 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Fri, 29 Jul 2016 14:26:54 +0000 (16:26 +0200)

Trivial merge