Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Sat, 1 Jun 2013 22:42:39 +0000 (00:42 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Sat, 1 Jun 2013 22:42:39 +0000 (00:42 +0200)

Trivial merge