Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Tue, 11 Mar 2014 14:47:05 +0000 (15:47 +0100)
committerMarcel Werk <burntime@woltlab.com>
Tue, 11 Mar 2014 14:47:05 +0000 (15:47 +0100)

Trivial merge