Merge branch 'master' of git.ganneff.de:emacs
authorJoerg Jaspert <joerg@debian.org>
Wed, 9 Dec 2015 21:34:33 +0000 (22:34 +0100)
committerJoerg Jaspert <joerg@debian.org>
Wed, 9 Dec 2015 21:34:33 +0000 (22:34 +0100)
commit5a078b39924cbc58186813b0d2a8ce4a1182cbb7
tree6eebacaf0836c6ae3a7b0265b2c3cab16512121a
parentbc8a695d7031fa1f51c543f4cad19a55e93ca461
parentc7d4d1a691afdc78a20188368952bb6ed8bd9d91
Merge branch 'master' of git.ganneff.de:emacs

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