Merge branch 'maint'
commit72c3c4225918d2004ad463510bc5dce493dde788
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Mon, 27 Mar 2017 11:36:49 +0000 (27 13:36 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Mon, 27 Mar 2017 11:36:49 +0000 (27 13:36 +0200)
tree0bb5515e293eaf119e7373c16aa162af1cf9a06b
parente9018fbd0eb8b4f4b89663d03e3b4dd2a6863a42
parent4dde26f0863ca57fd3fdfb8dc57c631cb22e6cc1
Merge branch 'maint'
lisp/org.el
testing/lisp/test-org.el