Merge branch 'maint'
commit571dfe2a3fb0af20caf238235f14244336563b5b
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Mon, 17 Apr 2017 08:38:24 +0000 (17 10:38 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Mon, 17 Apr 2017 08:38:24 +0000 (17 10:38 +0200)
tree58f67f0500ef876bd19fd7a7ea86b484f1fb1ed6
parent0d35d9d0d6c394fb4b2b11a4300a4fe758629b2a
parent165f7c395073b649d7da9a12c52a34b724ed4cf0
Merge branch 'maint'
lisp/org.el