Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Thu, 21 Nov 2013 18:15:12 +0000 (19:15 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Thu, 21 Nov 2013 18:15:12 +0000 (19:15 +0100)

Trivial merge