Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Sun, 18 Nov 2012 21:55:42 +0000 (22:55 +0100)
committerMarcel Werk <burntime@woltlab.com>
Sun, 18 Nov 2012 21:55:42 +0000 (22:55 +0100)

Trivial merge