Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Wed, 7 Aug 2013 14:30:37 +0000 (16:30 +0200)
committerMarcel Werk <burntime@woltlab.com>
Wed, 7 Aug 2013 14:30:37 +0000 (16:30 +0200)

Trivial merge