Merge branch 'master' of git.ganneff.de:emacs
authorJoerg Jaspert <joerg@debian.org>
Fri, 20 Feb 2015 22:33:28 +0000 (23:33 +0100)
committerJoerg Jaspert <joerg@debian.org>
Fri, 20 Feb 2015 22:33:28 +0000 (23:33 +0100)
commitfd87799d00fbb2ccbb8a950f3cb506c97c0965dd
tree4ee959e3596600ebae491f163b740068d9dfa62b
parent28b60938aa242bcf3502ea8fec3c818ca68f7709
parentba23003eb46181697bf7ec889fad67f4909b4126
Merge branch 'master' of git.ganneff.de:emacs

* 'master' of git.ganneff.de:emacs:
  add golden ratio mode
.emacs.d/config/emacs.org