Merge branch 'master' of git.ganneff.de:emacs
authorJoerg Jaspert <joerg@debian.org>
Mon, 8 Apr 2013 18:43:32 +0000 (20:43 +0200)
committerJoerg Jaspert <joerg@debian.org>
Mon, 8 Apr 2013 18:43:32 +0000 (20:43 +0200)
commit04a266b2741f27a9dfec86d53941eb4f6c10efec
tree29f422f3d57d259945159054b4b634ab5aa7d6bb
parent4ff4cb0a1d05abd9af1437501788609bd74f178b
parent871f73b9f8d4436155578fb0b992e31b47ef64a8
Merge branch 'master' of git.ganneff.de:emacs

* 'master' of git.ganneff.de:emacs:
  add sunrise-mode. add hilight-current-line mode. allow meta-shift-up/down to move liens
.emacs.d/config/emacs.org