Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Mon, 12 Aug 2013 11:21:01 +0000 (13:21 +0200)
committerMarcel Werk <burntime@woltlab.com>
Mon, 12 Aug 2013 11:21:01 +0000 (13:21 +0200)

Trivial merge