Merge branch 'master' into notifications
authorAlexander Ebert <ebert@woltlab.com>
Fri, 20 Jun 2014 10:23:02 +0000 (12:23 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Fri, 20 Jun 2014 10:23:02 +0000 (12:23 +0200)

Trivial merge