Merge branch 'maint'
commit482db1551d6571041248f405630f090aa2b0969c
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 7 Jul 2016 10:21:21 +0000 (7 12:21 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 7 Jul 2016 10:21:21 +0000 (7 12:21 +0200)
tree7650b5369657fb15aec5c70333084aedd0e64e24
parent610ec90cf4a1ffa91e04ae057564943bf616eabe
parentebe7aa66928a01f3af89c9ebeb5c5e130a5b3265
Merge branch 'maint'
contrib/lisp/org-eldoc.el