Merge branch 'master' of git.ganneff.de:emacs
authorJoerg Jaspert <joerg@debian.org>
Sat, 11 Mar 2017 16:53:08 +0000 (17:53 +0100)
committerJoerg Jaspert <joerg@debian.org>
Sat, 11 Mar 2017 16:53:08 +0000 (17:53 +0100)
* 'master' of git.ganneff.de:emacs:
  Switch to atomic chrome

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

Simple merge