Merge branch 'fix_fr' of git://github.com/jnavila/git