Merge branch 'master' of git.ganneff.de:emacs
authorJoerg Jaspert <joerg@ganneff.de>
Thu, 24 Apr 2014 08:33:16 +0000 (10:33 +0200)
committerJoerg Jaspert <joerg@ganneff.de>
Thu, 24 Apr 2014 08:33:16 +0000 (10:33 +0200)
commitb7b171f694170582aba22930dc176611ee0168d7
treefe1883e9d488c45c1713b7c10606b016a0e365ff
parentecc54de231def3da2a907281fdc064c4b757b3b7
parentdf0293c8a811693eab774db6fe3725a08cda7d58
Merge branch 'master' of git.ganneff.de:emacs

* 'master' of git.ganneff.de:emacs:
  adjust notmuch-fcc-dirs and bookmarks
  fix lib name
.emacs.d/config/emacs.org