Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Fri, 4 Jan 2013 15:39:03 +0000 (16:39 +0100)
committerMarcel Werk <burntime@woltlab.com>
Fri, 4 Jan 2013 15:39:03 +0000 (16:39 +0100)

Trivial merge