Merge branch 'maint'
commit1ac8e29605645b20048a14a09c203f18fb4678c4
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Tue, 17 Jan 2017 09:00:55 +0000 (17 10:00 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Tue, 17 Jan 2017 09:00:55 +0000 (17 10:00 +0100)
tree08239d29d9ea757c927b23bb63742f22c21d36db
parent985ffb13d272be71212644a8b565959b48b29e43
parent181dc50d110f3ae01a60891074c445654d5b6182
Merge branch 'maint'
lisp/org.el