Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Thu, 14 Feb 2013 17:06:14 +0000 (18:06 +0100)
committerMarcel Werk <burntime@woltlab.com>
Thu, 14 Feb 2013 17:06:14 +0000 (18:06 +0100)

Trivial merge