Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Sun, 25 Aug 2013 15:46:51 +0000 (17:46 +0200)
committerMarcel Werk <burntime@woltlab.com>
Sun, 25 Aug 2013 15:46:51 +0000 (17:46 +0200)

Trivial merge