Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Tue, 6 Aug 2013 22:07:52 +0000 (00:07 +0200)
committerMarcel Werk <burntime@woltlab.com>
Tue, 6 Aug 2013 22:07:52 +0000 (00:07 +0200)

Trivial merge