Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Tue, 27 May 2014 19:14:29 +0000 (21:14 +0200)
committerMarcel Werk <burntime@woltlab.com>
Tue, 27 May 2014 19:14:29 +0000 (21:14 +0200)

Trivial merge