Merge branch 'maint'
commitcadbef99f02a04f6d426654a1957cbd5d5b2c7fe
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Mon, 22 May 2017 06:19:12 +0000 (22 08:19 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Mon, 22 May 2017 06:19:12 +0000 (22 08:19 +0200)
tree8694241cb7e582420b47b7242aa0c6552a69a968
parentf335c3517de06eb74a3c3727843f276147795a84
parent7560a4945916e1106ed86f37067b1f03dc383b6c
Merge branch 'maint'
lisp/org.el