trailing spaces and koi8 to utf8
Merge branch 'master' into abra
tailing spaces
little clean up