Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Tue, 16 Oct 2012 23:18:42 +0000 (01:18 +0200)
committerMarcel Werk <burntime@woltlab.com>
Tue, 16 Oct 2012 23:18:42 +0000 (01:18 +0200)

Trivial merge