Merge branch 'maint'
commit1b12ad5cf6ef03131872d84801f4411856c5473e
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 4 Oct 2017 10:58:41 +0000 (4 12:58 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 4 Oct 2017 10:58:41 +0000 (4 12:58 +0200)
tree7d9c55a2f09f9548787bde0e653da7a66dc696a9
parent7a2b642ad1f2495f5197e299ee773ffbacb5027a
parentef6dac812b75f6f421bed7bc84d6f166c0b90f71
Merge branch 'maint'
lisp/org.el
testing/lisp/test-org.el