Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Thu, 25 Apr 2013 15:45:16 +0000 (17:45 +0200)
committerMarcel Werk <burntime@woltlab.com>
Thu, 25 Apr 2013 15:45:16 +0000 (17:45 +0200)

Trivial merge