Merge branch 'maint' master
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Tue, 30 Aug 2016 09:52:23 +0000 (11:52 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Tue, 30 Aug 2016 09:52:23 +0000 (11:52 +0200)
commitf685535f7263a57f4fff44e443365a4ed9f7726a
tree7a7c6480899684d7354e04ea9bb1cb927f7a2778
parent0b7584822882964d8e6e447b464405dd97dc9a98
parentbca5bd1e40c07871e8425e269ec20579b0c8519c
Merge branch 'maint'
lisp/org-entities.el