Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Sat, 1 Nov 2014 21:05:14 +0000 (22:05 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Sat, 1 Nov 2014 21:05:14 +0000 (22:05 +0100)

Trivial merge