Merge branch 'master' of ssh://karl@git.sv.gnu.org/srv/git/gnulib
[pspp] / .gitattributes
2008-02-11 Bruno HaibleSpecify custom merge drivers.