Merge branch 'maint'
commit52e0a83f328301a6a7c48f398ca0932a1aba931c
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 8 Jun 2017 19:00:51 +0000 (8 21:00 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 8 Jun 2017 19:00:51 +0000 (8 21:00 +0200)
treeb12a723fdbccd353fc544acf92052981bf364771
parentddc80b628ac0cc1cdd75e4e42c021e575aab763b
parent6921d84198d836fd65c661c9ed586a90a744c74e
Merge branch 'maint'
lisp/ox.el