Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Fri, 2 Aug 2013 13:06:35 +0000 (15:06 +0200)
committerMarcel Werk <burntime@woltlab.com>
Fri, 2 Aug 2013 13:06:35 +0000 (15:06 +0200)

Trivial merge