Merge branch 'maint'
commit68df8bc4fd1d133d7458115b8107104b268541a6
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 18 Nov 2016 22:04:15 +0000 (18 23:04 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 18 Nov 2016 22:04:15 +0000 (18 23:04 +0100)
tree0f94c83cecbbe9a4cd1085e657e4b2c70defdf6b
parent0a24f501360d4c66948f7adda1e4acd641d2acf7
parentb3125dc84bf6fd17f803b1270c538b0cfda34350
Merge branch 'maint'
lisp/ox-icalendar.el