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

Trivial merge