Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Tue, 3 Sep 2013 21:56:37 +0000 (23:56 +0200)
committerMarcel Werk <burntime@woltlab.com>
Tue, 3 Sep 2013 21:56:37 +0000 (23:56 +0200)

Trivial merge