Merge branch 'maint'
commitbfbaf1caa418c371ed117184527eb597179a7e68
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Mon, 7 Aug 2017 12:47:14 +0000 (7 14:47 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Mon, 7 Aug 2017 12:47:14 +0000 (7 14:47 +0200)
tree7f2701fd08f7936dac285b062d651716d27d8d77
parente805aba972fe77e05e0d763fbe97e933507ccc06
parentec129f8e10f79c38e5e6a64fecb90b77960a3f02
Merge branch 'maint'
lisp/org.el