Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Fri, 23 May 2014 11:12:04 +0000 (13:12 +0200)
committerMarcel Werk <burntime@woltlab.com>
Fri, 23 May 2014 11:12:04 +0000 (13:12 +0200)

Trivial merge