Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Mon, 24 Jun 2013 16:46:20 +0000 (18:46 +0200)
committerMarcel Werk <burntime@woltlab.com>
Mon, 24 Jun 2013 16:46:20 +0000 (18:46 +0200)

Trivial merge