Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Mon, 14 May 2012 18:30:25 +0000 (20:30 +0200)
committerMarcel Werk <burntime@woltlab.com>
Mon, 14 May 2012 18:30:25 +0000 (20:30 +0200)

Trivial merge