Merge branch 'maint'
commit2fbf8cb986f628758b0bec213fd254c40f7e6ef8
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 27 Jan 2017 22:58:09 +0000 (27 23:58 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 27 Jan 2017 22:58:09 +0000 (27 23:58 +0100)
treeaa313def279958204355f64c732566eb65e71362
parent6cb6a39443dfc234ac71ae25b58ee31eecbf2e9c
parentebb9da0d037eea1968efd6612f00dec1819cb866
Merge branch 'maint'
lisp/org.el