Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Thu, 11 Apr 2013 20:13:57 +0000 (22:13 +0200)
committerMarcel Werk <burntime@woltlab.com>
Thu, 11 Apr 2013 20:13:57 +0000 (22:13 +0200)

Trivial merge