Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Tue, 21 May 2013 13:53:23 +0000 (15:53 +0200)
committerMarcel Werk <burntime@woltlab.com>
Tue, 21 May 2013 13:53:23 +0000 (15:53 +0200)

Trivial merge