.
Merge branch 'master' of https://github.com/depappas/emacs

.