Merge branch 'maint'
commit0863f8d1ca46f4f25fa6bc6273a9695ec404bb76
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 15 Dec 2016 21:18:43 +0000 (15 22:18 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 15 Dec 2016 21:18:43 +0000 (15 22:18 +0100)
treef7197f93c2b2e0a8bdccce2bc12572016ed356ef
parenta5e91f5e51b9929b64f41a14f173fd91a2c09a96
parenta1f516f8a5082de84f7929960e004dbb0f0fdfa5
Merge branch 'maint'
lisp/org-agenda.el