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

Trivial merge