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

Trivial merge