Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Sat, 2 Feb 2013 00:15:15 +0000 (01:15 +0100)
committerMarcel Werk <burntime@woltlab.com>
Sat, 2 Feb 2013 00:15:15 +0000 (01:15 +0100)

Trivial merge