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

Trivial merge