Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Mon, 8 Jul 2013 19:09:10 +0000 (21:09 +0200)
committerMarcel Werk <burntime@woltlab.com>
Mon, 8 Jul 2013 19:09:10 +0000 (21:09 +0200)

Trivial merge