Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Tue, 8 Jul 2014 22:47:51 +0000 (00:47 +0200)
committerMarcel Werk <burntime@woltlab.com>
Tue, 8 Jul 2014 22:47:51 +0000 (00:47 +0200)

Trivial merge