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

Trivial merge