Merge branch 'maint'
commit42f24c167c3fb156a2fed7daf485640063526245
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Sat, 15 Apr 2017 14:52:46 +0000 (15 16:52 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Sat, 15 Apr 2017 14:52:46 +0000 (15 16:52 +0200)
tree3a5cd36bd38918785cf09146a159c373fe84178c
parent99857689dbf6382a7ce1594024b17bf5ba47db67
parent74379eaaa2443f7a9fe62e04606c49613f5e6204
Merge branch 'maint'
lisp/org.el
testing/lisp/test-org.el