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

Trivial merge