Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Thu, 4 Jul 2013 00:25:45 +0000 (02:25 +0200)
committerMarcel Werk <burntime@woltlab.com>
Thu, 4 Jul 2013 00:25:45 +0000 (02:25 +0200)

Trivial merge