Merge branch 'master' of git.ganneff.de:emacs
authorJoerg Jaspert <joerg.jaspert@dlh.de>
Tue, 22 Dec 2015 13:58:40 +0000 (14:58 +0100)
committerJoerg Jaspert <joerg.jaspert@dlh.de>
Tue, 22 Dec 2015 13:58:40 +0000 (14:58 +0100)
commit305d86e5db41f3722efd333aa4a0b31850f8e56a
tree5fbd7d54bce78cc7d96e41f0763aa859e3e86c2c
parent550f29f7d579f65a7d647414ee9c14e6833853b0
parentcb07eb934a8efa9a14857f8874d26d8644da865d
Merge branch 'master' of git.ganneff.de:emacs

* 'master' of git.ganneff.de:emacs:
  Add edit-server for chromium
.emacs.d/config/emacs.org