elisp/
Merge branch 'master' of https://github.com/klang/.emacs.d