Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Tue, 28 Jan 2014 18:58:40 +0000 (19:58 +0100)
committerMarcel Werk <burntime@woltlab.com>
Tue, 28 Jan 2014 18:58:40 +0000 (19:58 +0100)

Trivial merge