Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Mon, 8 Apr 2013 23:30:45 +0000 (01:30 +0200)
committerMarcel Werk <burntime@woltlab.com>
Mon, 8 Apr 2013 23:30:45 +0000 (01:30 +0200)

Trivial merge