Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Mon, 9 Apr 2012 18:36:23 +0000 (20:36 +0200)
committerMarcel Werk <burntime@woltlab.com>
Mon, 9 Apr 2012 18:36:23 +0000 (20:36 +0200)

Trivial merge