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)
* 'master' of git.ganneff.de:emacs:
  Adjust inf-ruby part

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


Trivial merge