Merge branch 'maint'
commit11df58e6f4e9354faa947d4c80a6744a50fe7bdc
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 1 Jul 2016 07:13:52 +0000 (1 09:13 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 1 Jul 2016 07:13:52 +0000 (1 09:13 +0200)
treede5bdb2ec3867f417d779aeb8de871bfe025ac5c
parent67023930e7f7ca86eac05a1c5b7c7771c3238d9c
parenta8e4a393bf5e5350823a452d104730bbb06d8660
Merge branch 'maint'
lisp/org-entities.el