Merge branch 'maint'
commitb66fd12f4f5a48a7680ab2c35f27aad66d37d46e
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 30 Sep 2015 11:56:11 +0000 (30 13:56 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 30 Sep 2015 11:56:11 +0000 (30 13:56 +0200)
tree3acbc1b14f234f8e7d065f0a3fdc54862a68882f
parent679adcaa64613c821b38cd1d34b081640315293a
parent115c4bd5a7d3c87184e147fe309e77589c004ddf
Merge branch 'maint'
lisp/org-feed.el