Merge branch 'fr_2.2.0' of git://github.com/jnavila/git