Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Thu, 11 Jul 2013 14:26:31 +0000 (16:26 +0200)
committerMarcel Werk <burntime@woltlab.com>
Thu, 11 Jul 2013 14:26:31 +0000 (16:26 +0200)

Trivial merge