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

Trivial merge