Merge branch 'rus' of git://github.com/diseaz/gitmagic into rus