Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Mon, 10 Jun 2013 21:05:02 +0000 (23:05 +0200)
committerMarcel Werk <burntime@woltlab.com>
Mon, 10 Jun 2013 21:05:02 +0000 (23:05 +0200)

Trivial merge