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

Trivial merge