Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Thu, 29 May 2014 20:23:40 +0000 (22:23 +0200)
committerMarcel Werk <burntime@woltlab.com>
Thu, 29 May 2014 20:23:40 +0000 (22:23 +0200)

Trivial merge