Merge branch 'master' into notifications
authorAlexander Ebert <ebert@woltlab.com>
Thu, 19 Jun 2014 18:59:21 +0000 (20:59 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Thu, 19 Jun 2014 18:59:21 +0000 (20:59 +0200)

Trivial merge