Merge branch 'maint'
commit3fd361eb77f8c760ccfc7224d3e79d54823923d0
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 2 Jun 2016 11:32:59 +0000 (2 13:32 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 2 Jun 2016 11:33:34 +0000 (2 13:33 +0200)
treec444c1db7293c27d7fa742b7abf3e63529550b97
parentc702dd003490ca6bdc84238183bfc151c282b8ba
parent5111c3a5fa0dcc7bacb065270d87a03bde4888b5
Merge branch 'maint'
lisp/org.el
testing/lisp/test-org.el