Merge branch 'maint'
commit901d2470ddc862b07a2cbf30d3b0e5fed997030b
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 15 Dec 2016 13:24:46 +0000 (15 14:24 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 15 Dec 2016 13:24:46 +0000 (15 14:24 +0100)
treeb81d24e27a3095549ec5897644598af132c7194f
parentf5b7de222d07b13dae8a131c898507e4e714298d
parent51227cff9424ffd1d431caa9342b53f067876076
Merge branch 'maint'
lisp/org.el