Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Sun, 6 Oct 2013 20:52:12 +0000 (22:52 +0200)
committerMarcel Werk <burntime@woltlab.com>
Sun, 6 Oct 2013 20:52:12 +0000 (22:52 +0200)

Trivial merge