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

Trivial merge