Merge branch 'maint'
commit4c40dc65d0a5b048d40b1d48fd23089a19db7f70
authorNicolas Goaziou <n.goaziou@gmail.com>
Wed, 23 Apr 2014 19:55:38 +0000 (23 21:55 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Wed, 23 Apr 2014 19:55:38 +0000 (23 21:55 +0200)
treeed2a498c6a9a18e5362478c95de6022a26866a14
parentf05bdc2d394864e9e76d1c08fdca5521eae1992d
parentc3e19caa1a14a4d9847d014ff3e1eaf683c75d22
Merge branch 'maint'
lisp/ox-icalendar.el