Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Mon, 24 Dec 2012 23:40:40 +0000 (00:40 +0100)
committerMarcel Werk <burntime@woltlab.com>
Mon, 24 Dec 2012 23:40:40 +0000 (00:40 +0100)

Trivial merge