Merge branch 'maint'
commita0d1ad325d0196f7ede1a8cde39daa2946a97d62
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 22 Jun 2017 16:32:38 +0000 (22 18:32 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 22 Jun 2017 16:32:38 +0000 (22 18:32 +0200)
treed34e3526d0540027bad25b98ab5fd5d5ee02ed07
parent92e8c85381034e932309573076ed585acc5712c6
parent5d99560ddf4ea362394a645d3cefcc4d8cb80686
Merge branch 'maint'
lisp/org.el
testing/lisp/test-org.el