Merge branch 'master' of git.ganneff.de:emacs
drwxr-xr-x - .emacs.d
drwxr-xr-x - bin