Merge branch 'maint-1.6.0' into maint-1.6.1
[git] / git-gui / .gitattributes
1 *           encoding=US-ASCII
2 git-gui.sh  encoding=UTF-8
3 /po/*.po    encoding=UTF-8