Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Tue, 30 Jul 2013 12:09:49 +0000 (14:09 +0200)
committerMarcel Werk <burntime@woltlab.com>
Tue, 30 Jul 2013 12:09:49 +0000 (14:09 +0200)

Trivial merge