Merge branch 'maint'
commit7a20ccafb5e56af0b4d32bb5daa7a00f4c2c0cf9
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Sat, 20 Jan 2018 14:55:36 +0000 (20 15:55 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Sat, 20 Jan 2018 14:55:36 +0000 (20 15:55 +0100)
treed33cb35755ca23ee31fb14205ea0636b9b959caf
parentb7e94882eaf3106a904274b034896b33bfe0774f
parentb891e46ccb72427358e3cc82c150f89d7e4eb135
Merge branch 'maint'
lisp/org.el