Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Fri, 12 Jul 2013 14:32:48 +0000 (16:32 +0200)
committerMarcel Werk <burntime@woltlab.com>
Fri, 12 Jul 2013 14:32:48 +0000 (16:32 +0200)

Trivial merge