Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Wed, 1 May 2013 14:34:25 +0000 (16:34 +0200)
committerMarcel Werk <burntime@woltlab.com>
Wed, 1 May 2013 14:34:25 +0000 (16:34 +0200)

Trivial merge