Merge branch 'maint'
commitc8f3833e9b5d4586a84e3472043e4b61dac20bb6
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Mon, 7 Aug 2017 10:56:20 +0000 (7 12:56 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Mon, 7 Aug 2017 10:56:20 +0000 (7 12:56 +0200)
treeb204aa8b6f312e094d3c8b70d8cc01e29e767e87
parent8c1c549376e94f787879c08c5dee1c510f901bbe
parent6a9fc480978a9bfd28d972e399e493c79eddcbaa
Merge branch 'maint'
lisp/org.el