Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Fri, 4 Oct 2013 22:32:51 +0000 (00:32 +0200)
committerMarcel Werk <burntime@woltlab.com>
Fri, 4 Oct 2013 22:32:51 +0000 (00:32 +0200)

Trivial merge