Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Tue, 29 Jan 2013 16:11:58 +0000 (17:11 +0100)
committerMarcel Werk <burntime@woltlab.com>
Tue, 29 Jan 2013 16:11:58 +0000 (17:11 +0100)

Trivial merge