Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Mon, 4 Feb 2013 19:29:55 +0000 (20:29 +0100)
committerMarcel Werk <burntime@woltlab.com>
Mon, 4 Feb 2013 19:29:55 +0000 (20:29 +0100)

Trivial merge