Merge remote-tracking branches 'distorted/master' and 'ponder/master'
[profile] / .gitattributes
1 *.el diff=lisp
2 dot/emacs diff=lisp