Merge branch 'emails' into next
authorTim Düsterhus <duesterhus@woltlab.com>
Sat, 25 Jul 2015 15:15:50 +0000 (17:15 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Sat, 25 Jul 2015 15:15:50 +0000 (17:15 +0200)

Trivial merge