Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Sat, 18 May 2013 21:38:26 +0000 (23:38 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Sat, 18 May 2013 21:38:26 +0000 (23:38 +0200)

Trivial merge