Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Sat, 16 Jun 2012 18:41:28 +0000 (20:41 +0200)
committerMarcel Werk <burntime@woltlab.com>
Sat, 16 Jun 2012 18:41:28 +0000 (20:41 +0200)

Trivial merge