Merge branch 'maint'
commit0ba5e3508264ea59329d4cd31d3ee6eb3ba7bacf
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 26 Jan 2017 23:29:14 +0000 (27 00:29 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 26 Jan 2017 23:29:14 +0000 (27 00:29 +0100)
tree8edd949106c10702667929fac7b19223d6c7d8b6
parentd2b93613ad4619d496a2bc1b8c5fe73fe710f297
parent919e864968c14d167c512f04fd4f06f3dcf08a00
Merge branch 'maint'
lisp/org.el
testing/lisp/test-org.el