Merge branch 'jc/1.7.0-status' into next
[git] / git-gui / .gitattributes
1 *           encoding=US-ASCII
2 git-gui.sh  encoding=UTF-8
3 /po/*.po    encoding=UTF-8