Merge branch 'maint'
commitad1c0faa7e5624a69f8c63bf033ceb9c0d2c8bfa
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 7 Sep 2017 12:38:23 +0000 (7 14:38 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 7 Sep 2017 12:38:23 +0000 (7 14:38 +0200)
treef4a378d3ef0248734360db8d636b42e6618df550
parentd41c256ea2c78f2a1481799053320739bce56d3d
parentf1a1cad93a1648942a3999f0b133fcc3e58d7a96
Merge branch 'maint'
etc/ORG-NEWS
lisp/org-agenda.el
lisp/org.el