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

Trivial merge