Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Thu, 26 Sep 2013 19:14:51 +0000 (21:14 +0200)
committerMarcel Werk <burntime@woltlab.com>
Thu, 26 Sep 2013 19:14:51 +0000 (21:14 +0200)

Trivial merge