Merge branch 'maint'
commit15df8db7adeb7a4847da2b8acafca430a4eecad7
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Mon, 4 Dec 2017 21:43:31 +0000 (4 22:43 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Mon, 4 Dec 2017 21:43:31 +0000 (4 22:43 +0100)
tree737742ccc0c42cc06a43d9ab831a476b45f7bfa0
parent494414028ab0f3f87e342bfccb69d32a89384fa7
parent0e7e3bc6df812229aa87a39b07f9eb7b1ca2ea16
Merge branch 'maint'
lisp/org-agenda.el
lisp/org.el