Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Mon, 11 Feb 2013 23:52:04 +0000 (00:52 +0100)
committerMarcel Werk <burntime@woltlab.com>
Mon, 11 Feb 2013 23:52:04 +0000 (00:52 +0100)

Trivial merge