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

Trivial merge