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

Trivial merge