Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Fri, 23 Aug 2013 14:28:19 +0000 (16:28 +0200)
committerMarcel Werk <burntime@woltlab.com>
Fri, 23 Aug 2013 14:28:19 +0000 (16:28 +0200)

Trivial merge