Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Mon, 13 May 2013 19:12:00 +0000 (21:12 +0200)
committerMarcel Werk <burntime@woltlab.com>
Mon, 13 May 2013 19:12:00 +0000 (21:12 +0200)

Trivial merge