Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Sat, 20 Jul 2013 20:22:16 +0000 (22:22 +0200)
committerMarcel Werk <burntime@woltlab.com>
Sat, 20 Jul 2013 20:22:16 +0000 (22:22 +0200)

Trivial merge