Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Mon, 3 Jun 2013 15:56:25 +0000 (17:56 +0200)
committerMarcel Werk <burntime@woltlab.com>
Mon, 3 Jun 2013 15:56:25 +0000 (17:56 +0200)

Trivial merge