Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Wed, 19 Jun 2013 20:24:39 +0000 (22:24 +0200)
committerMarcel Werk <burntime@woltlab.com>
Wed, 19 Jun 2013 20:24:39 +0000 (22:24 +0200)

Trivial merge