Merge branch 'maint'
commit7d21349dbe5d8ede861e3577eb34c523881d16aa
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Mon, 7 Aug 2017 11:12:32 +0000 (7 13:12 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Mon, 7 Aug 2017 11:12:32 +0000 (7 13:12 +0200)
tree9dbfdc8f14c71891c5d74bbd5d57135d45d3a626
parentc8f3833e9b5d4586a84e3472043e4b61dac20bb6
parentf6a28ba1c23f9fa2370a35e432142b08abf0846c
Merge branch 'maint'
lisp/org.el