Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Wed, 10 Apr 2013 18:15:44 +0000 (20:15 +0200)
committerMarcel Werk <burntime@woltlab.com>
Wed, 10 Apr 2013 18:15:44 +0000 (20:15 +0200)

Trivial merge