Merge remote-tracking branches 'spirit', 'crybaby' and 'staging'
[profile] / .gitattributes
1 *.el diff=lisp
2 dot/emacs diff=lisp