Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Fri, 30 May 2014 13:10:17 +0000 (15:10 +0200)
committerMarcel Werk <burntime@woltlab.com>
Fri, 30 May 2014 13:10:17 +0000 (15:10 +0200)

Trivial merge