Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Mon, 20 Aug 2012 11:49:16 +0000 (13:49 +0200)
committerMarcel Werk <burntime@woltlab.com>
Mon, 20 Aug 2012 11:49:16 +0000 (13:49 +0200)

Trivial merge