Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Mon, 15 Jul 2013 12:15:12 +0000 (14:15 +0200)
committerMarcel Werk <burntime@woltlab.com>
Mon, 15 Jul 2013 12:15:12 +0000 (14:15 +0200)

Trivial merge