Merge branch 'maint'
commit517fed8d4daf268baea15f72db6ac0a7e69c98c7
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Mon, 26 Dec 2016 09:32:42 +0000 (26 10:32 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Mon, 26 Dec 2016 09:32:42 +0000 (26 10:32 +0100)
treeb7879d8bedf940b4038116f52924ffead9b1e04c
parentc98a343f8def78c1f976c14ff1cdde9e91ec10cb
parent4cf56e6e890ed67d3e2210d4cc25641d12a89334
Merge branch 'maint'
lisp/org.el
testing/lisp/test-org.el