Merge branch 'maint'
commite103ad8ae1b1e7effe71b99fd027fc67bf8c43ef
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 26 Nov 2015 13:23:01 +0000 (26 14:23 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 26 Nov 2015 13:23:01 +0000 (26 14:23 +0100)
tree30abb73a50fcdad387d232a1d26c5527693aa1db
parent12c118b43d66064b2d4d5d13e58ccc55c521cedd
parentb0a436cb8e316b266c4d5f3691cc94625a3238b5
Merge branch 'maint'
lisp/org-agenda.el
lisp/ox-icalendar.el