Merge branch 'system-mail'
authorTim Düsterhus <duesterhus@woltlab.com>
Mon, 28 Apr 2014 19:16:52 +0000 (21:16 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Mon, 28 Apr 2014 19:17:13 +0000 (21:17 +0200)

Trivial merge