Merge branch 'email-template' into next
authorTim Düsterhus <duesterhus@woltlab.com>
Mon, 30 May 2016 16:42:04 +0000 (18:42 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Mon, 30 May 2016 16:42:04 +0000 (18:42 +0200)

Trivial merge