Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Fri, 13 Sep 2013 20:00:51 +0000 (22:00 +0200)
committerMarcel Werk <burntime@woltlab.com>
Fri, 13 Sep 2013 20:00:51 +0000 (22:00 +0200)

Trivial merge