Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Sun, 25 May 2014 11:44:48 +0000 (13:44 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Sun, 25 May 2014 11:44:48 +0000 (13:44 +0200)

Trivial merge