Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Thu, 6 Jun 2013 23:06:11 +0000 (01:06 +0200)
committerMarcel Werk <burntime@woltlab.com>
Thu, 6 Jun 2013 23:06:11 +0000 (01:06 +0200)

Trivial merge