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

Trivial merge