Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Fri, 30 Mar 2012 16:23:34 +0000 (18:23 +0200)
committerMarcel Werk <burntime@woltlab.com>
Fri, 30 Mar 2012 16:23:34 +0000 (18:23 +0200)

Trivial merge