Merge branch 'maint'
commit9da78f3e8db8ab858972aa16627f85586a370d12
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 3 Feb 2017 21:04:12 +0000 (3 22:04 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 3 Feb 2017 21:04:12 +0000 (3 22:04 +0100)
tree0c901b230ad330d7f7f2e2852a00635681e91142
parenta10ddbe2ac664e64fc15a672fa3a522180b3b30c
parent6da9d0a416090df0491a81d48a62e0b8569a80ad
Merge branch 'maint'
lisp/org.el
testing/lisp/test-org.el