Merge branch 'master' of ssh://bonzini@git.sv.gnu.org/srv/git/gnulib
[gnulib.git] / .gitattributes
1 ChangeLog       merge=merge-changelog