Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Sun, 28 Apr 2013 01:55:30 +0000 (03:55 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Sun, 28 Apr 2013 01:55:30 +0000 (03:55 +0200)

Trivial merge