Merge branch 'master' into fairchild
[profile] / .gitattributes
CommitLineData
d3595fdf
MW
1*.el diff=lisp
2dot/emacs diff=lisp