Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Sun, 27 Oct 2013 20:57:06 +0000 (21:57 +0100)
committerMarcel Werk <burntime@woltlab.com>
Sun, 27 Oct 2013 20:57:06 +0000 (21:57 +0100)

Trivial merge