Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Wed, 31 Jul 2013 17:43:26 +0000 (19:43 +0200)
committerMarcel Werk <burntime@woltlab.com>
Wed, 31 Jul 2013 17:43:26 +0000 (19:43 +0200)

Trivial merge