Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Wed, 12 Jun 2013 00:06:34 +0000 (02:06 +0200)
committerMarcel Werk <burntime@woltlab.com>
Wed, 12 Jun 2013 00:06:34 +0000 (02:06 +0200)

Trivial merge