Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Sat, 25 May 2013 13:58:56 +0000 (15:58 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Sat, 25 May 2013 13:58:56 +0000 (15:58 +0200)

Trivial merge