Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Sat, 25 Aug 2012 15:01:12 +0000 (17:01 +0200)
committerMarcel Werk <burntime@woltlab.com>
Sat, 25 Aug 2012 15:01:12 +0000 (17:01 +0200)

Trivial merge