Merge branch 'master' of https://github.com/WoltLab/WCF
authorLuzifr <szekely@woltlab.com>
Wed, 20 Jul 2011 17:25:47 +0000 (19:25 +0200)
committerLuzifr <szekely@woltlab.com>
Wed, 20 Jul 2011 17:25:47 +0000 (19:25 +0200)

Trivial merge