Merge branch 'maint'
commitf05bdc2d394864e9e76d1c08fdca5521eae1992d
authorNicolas Goaziou <n.goaziou@gmail.com>
Wed, 23 Apr 2014 19:49:47 +0000 (23 21:49 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Wed, 23 Apr 2014 19:49:47 +0000 (23 21:49 +0200)
tree7ea12ed116a663f1322a484d443dce3dc1cb767a
parent967cbf8ea1efc4f52ab7990167c25ead0a26d121
parent1819b90931e79c06e88071466aec330ab4963a0c
Merge branch 'maint'
lisp/ox-icalendar.el