Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Wed, 22 May 2013 13:40:44 +0000 (15:40 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Wed, 22 May 2013 13:40:44 +0000 (15:40 +0200)

Trivial merge