Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Fri, 12 Jul 2013 12:32:39 +0000 (14:32 +0200)
committerMarcel Werk <burntime@woltlab.com>
Fri, 12 Jul 2013 12:32:39 +0000 (14:32 +0200)

Trivial merge