Merge branch 'master' of git.ganneff.de:emacs
authorJoerg Jaspert <joerg@debian.org>
Fri, 4 Nov 2016 21:42:13 +0000 (22:42 +0100)
committerJoerg Jaspert <joerg@debian.org>
Fri, 4 Nov 2016 21:42:13 +0000 (22:42 +0100)
* 'master' of git.ganneff.de:emacs:
  Changes
  Updates

1  2 
.emacs.d/config/emacs.org

Simple merge