Merge branch 'maint'
commit1b259f95aaf8ec3e1cec4e4383e8e6364150c356
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Sat, 24 Feb 2018 21:38:27 +0000 (24 22:38 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Sat, 24 Feb 2018 21:38:27 +0000 (24 22:38 +0100)
tree664247879e80a3ae1b2a23b6a55ee583c19537d7
parent6e10c268de8d4372d53f1681e48a7df21ed2c051
parentfffd300efdfa21211c99955b3f9bbc7a1d23e5f8
Merge branch 'maint'
lisp/org-agenda.el
lisp/org.el