Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Wed, 4 Sep 2013 12:06:14 +0000 (14:06 +0200)
committerMarcel Werk <burntime@woltlab.com>
Wed, 4 Sep 2013 12:06:14 +0000 (14:06 +0200)

Trivial merge