Merge branch 'maint'
commitc6a74d4a58bed02eaf63a3ddeadee5d33e159fb7
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Tue, 24 Jan 2017 17:15:53 +0000 (24 18:15 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Tue, 24 Jan 2017 17:15:53 +0000 (24 18:15 +0100)
tree6d3afd41ba5eae9102c97f4aa8280857302b0a07
parent5210de7f1689b45f7d86bbb2f96640fe144afde1
parent4370ee4e44514e9ec96f1f654e16796c5434b3aa
Merge branch 'maint'
lisp/org-agenda.el