Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Wed, 7 Aug 2013 17:07:39 +0000 (19:07 +0200)
committerMarcel Werk <burntime@woltlab.com>
Wed, 7 Aug 2013 17:07:39 +0000 (19:07 +0200)

Trivial merge