Merge branch 'maint'
commita7e11643a93ee04acbae174d49edb75c5cd8f402
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Sun, 6 Aug 2017 08:31:06 +0000 (6 10:31 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Sun, 6 Aug 2017 08:31:06 +0000 (6 10:31 +0200)
treeb50af687ae82923f6a45ef194f46b34e969a2f87
parentb4032ed5974439e8b196967b022caf9ba8a388b5
parent9974ed39b2b69abdf87b37af9ea1ce46f0e508fe
Merge branch 'maint'
lisp/org-src.el
lisp/org.el