Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Fri, 10 May 2013 12:48:11 +0000 (14:48 +0200)
committerMarcel Werk <burntime@woltlab.com>
Fri, 10 May 2013 12:48:11 +0000 (14:48 +0200)

Trivial merge