Merge branch 'maint'
commit1ddadefd377bddf5346f28b104e8388460205c26
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 22 Dec 2016 12:13:08 +0000 (22 13:13 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 22 Dec 2016 12:13:08 +0000 (22 13:13 +0100)
treeee18109cbaa97c77d83b7e80a54ad48ddc9c44c3
parent7fd61c4f92583321c40f2fd7fafc3c6fdd047a75
parent820d1eb617733bc0aaae1e48a004aadb0bd1b54d
Merge branch 'maint'
lisp/org.el