Merge branch 'maint'
commit5bc540eae129c34d7763aacf7eaa596b04a3f256
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Sun, 30 Apr 2017 20:26:52 +0000 (30 22:26 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Sun, 30 Apr 2017 20:26:52 +0000 (30 22:26 +0200)
tree2996e8a3f2cc73fc69a0ca3fbc5432c44df06755
parent27c3c753588a258319896f50fd77796557a5c3b1
parent3502e6fa7cb304d6b29aef032fe49ea4a79b58f0
Merge branch 'maint'
lisp/org.el
testing/lisp/test-org.el