Merge branch 'master' of git.ganneff.de:emacs
authorJoerg Jaspert <joerg@debian.org>
Fri, 23 May 2014 08:32:01 +0000 (10:32 +0200)
committerJoerg Jaspert <joerg@debian.org>
Fri, 23 May 2014 08:32:01 +0000 (10:32 +0200)
commitf309b8cb47b2d951d0744587fc850de4ffb52874
tree80c397f1082b0608d12b036cafa8462ccae2c621
parent426dfb94d5f855aefce15b04d525d4ad79e528dc
parent3f3161379bc515d91819a19722351ad130da9a64
Merge branch 'master' of git.ganneff.de:emacs

* 'master' of git.ganneff.de:emacs:
  Adjust inf-ruby part

Conflicts:
.emacs.d/config/emacs.org