Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Tue, 3 Sep 2013 16:11:08 +0000 (18:11 +0200)
committerMarcel Werk <burntime@woltlab.com>
Tue, 3 Sep 2013 16:11:08 +0000 (18:11 +0200)

Trivial merge