Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Thu, 8 Aug 2013 10:55:31 +0000 (12:55 +0200)
committerMarcel Werk <burntime@woltlab.com>
Thu, 8 Aug 2013 10:55:31 +0000 (12:55 +0200)

Trivial merge