Merge branch 'maint'
commit6f6c2ea8d9368b63ea99e6aed5ccb0ec65157f03
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 29 Dec 2016 15:39:07 +0000 (29 16:39 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 29 Dec 2016 15:39:07 +0000 (29 16:39 +0100)
tree57762382fd7b99ee4ae5bfadd8bfeff5164aad76
parented0c8cb995329c05058739b98d68e879b1db7e95
parent3e68d01bdd3deeb9c81b7e9e03cb15989f4917fc
Merge branch 'maint'
lisp/org.el
testing/lisp/test-org.el