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

Trivial merge