Merge branch 'master' of github.com:WoltLab/WCF
authorTim Düsterhus <duesterhus@woltlab.com>
Fri, 10 Aug 2012 18:10:10 +0000 (20:10 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Fri, 10 Aug 2012 18:10:10 +0000 (20:10 +0200)

Trivial merge