Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Wed, 22 May 2013 13:12:02 +0000 (15:12 +0200)
committerMarcel Werk <burntime@woltlab.com>
Wed, 22 May 2013 13:12:02 +0000 (15:12 +0200)

Trivial merge