Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Sat, 4 May 2013 14:37:42 +0000 (16:37 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Sat, 4 May 2013 14:37:42 +0000 (16:37 +0200)

Trivial merge