Merge branch 'master' of git.distorted.org.uk:~mdw/publish/public-git/profile
[profile] / .gitattributes
1 *.el diff=lisp
2 dot/emacs diff=lisp