Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Sun, 31 Aug 2014 22:37:01 +0000 (00:37 +0200)
committerMarcel Werk <burntime@woltlab.com>
Sun, 31 Aug 2014 22:37:01 +0000 (00:37 +0200)

Trivial merge