Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Fri, 31 Aug 2012 13:20:58 +0000 (15:20 +0200)
committerMarcel Werk <burntime@woltlab.com>
Fri, 31 Aug 2012 13:20:58 +0000 (15:20 +0200)

Trivial merge