Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Mon, 30 Apr 2012 16:09:26 +0000 (18:09 +0200)
committerMarcel Werk <burntime@woltlab.com>
Mon, 30 Apr 2012 16:09:26 +0000 (18:09 +0200)

Trivial merge