Merge branch 'maint'
commit36170429c3037522e927961c00614049af59fa76
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Tue, 10 Apr 2018 18:10:47 +0000 (10 20:10 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Tue, 10 Apr 2018 18:10:47 +0000 (10 20:10 +0200)
treea7e14bf11170f22e2accd5ec5ba2e32eaead39e0
parent442e7a2911e3e0229b1b6dd1fe0449653274ec31
parent1553aae9948ff8c664d20df04ff3580ecf947a42
Merge branch 'maint'
contrib/lisp/org-notify.el