gpMerge branch 'master' of git.ganneff.de:emacs
authorJoerg Jaspert <joerg@nsb-software.de>
Thu, 2 Oct 2014 08:30:44 +0000 (10:30 +0200)
committerJoerg Jaspert <joerg@nsb-software.de>
Thu, 2 Oct 2014 08:30:44 +0000 (10:30 +0200)
commitcbbe727546255edb1f9fb281f5e0558dd4675df7
tree144df44aa3ec967f5b36007be83f36db963993a3
parent9c30c0099da23a02aaac99e965bf16f1f43cffb4
parent77d7702f3e0d92cb0cfe51ebf7bd8cfbe821895c
gpMerge branch 'master' of git.ganneff.de:emacs

* 'master' of git.ganneff.de:emacs:
  Update org-mode