Merge branch 'master' of git.ganneff.de:emacs
authorJoerg Jaspert <joerg@debian.org>
Thu, 15 Oct 2015 20:31:44 +0000 (22:31 +0200)
committerJoerg Jaspert <joerg@debian.org>
Thu, 15 Oct 2015 20:31:44 +0000 (22:31 +0200)
commitdbf80df15afefcffc3ea00304f25b46617c8d29e
tree71e088e00fa38dbaa5fed28a46f6258ff5a41ff3
parentbeed63a4f49d3f69d0c948168b20fc26bd33028c
parent23cc54edfbcd2f666cd573715b9dacd9d941cb16
Merge branch 'master' of git.ganneff.de:emacs

* 'master' of git.ganneff.de:emacs:
  Add corral, fix tramp
  Add wgrep
  Merge
.emacs.d/config/emacs.org