Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Wed, 23 Jan 2013 23:23:02 +0000 (00:23 +0100)
committerMarcel Werk <burntime@woltlab.com>
Wed, 23 Jan 2013 23:23:02 +0000 (00:23 +0100)

Trivial merge