Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Sun, 15 Sep 2013 13:59:55 +0000 (15:59 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Sun, 15 Sep 2013 13:59:55 +0000 (15:59 +0200)

Trivial merge