Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Mon, 22 Apr 2013 00:04:35 +0000 (02:04 +0200)
committerMarcel Werk <burntime@woltlab.com>
Mon, 22 Apr 2013 00:04:35 +0000 (02:04 +0200)

Trivial merge