Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Tue, 28 May 2013 18:57:05 +0000 (20:57 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Tue, 28 May 2013 18:57:05 +0000 (20:57 +0200)

Trivial merge