Merge branch 'maint'
commit60831c4606d03dca32d8151bd6e484128317d39d
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 13 Dec 2017 23:40:58 +0000 (14 00:40 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 13 Dec 2017 23:40:58 +0000 (14 00:40 +0100)
treec0a820860344d6be357a1cd0fabef7a7663e1753
parentbbf39576f4818c168e533a5dbace1601edee710b
parent263a0cf00ed528a835003293c1ff810f140ffd86
Merge branch 'maint'
lisp/org-agenda.el
lisp/org.el