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

Trivial merge