Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Fri, 16 Aug 2013 15:14:00 +0000 (17:14 +0200)
committerMarcel Werk <burntime@woltlab.com>
Fri, 16 Aug 2013 15:14:00 +0000 (17:14 +0200)

Trivial merge