Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Sun, 27 Jan 2013 14:44:14 +0000 (15:44 +0100)
committerMarcel Werk <burntime@woltlab.com>
Sun, 27 Jan 2013 14:44:14 +0000 (15:44 +0100)

Trivial merge