Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Thu, 30 May 2013 18:31:27 +0000 (20:31 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Thu, 30 May 2013 18:31:27 +0000 (20:31 +0200)

Trivial merge