Merge branch 'maint'
commit5e0efebef8898a1e0c505220e463dd7076a0130a
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Sat, 14 Nov 2015 08:29:37 +0000 (14 09:29 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Sat, 14 Nov 2015 08:29:37 +0000 (14 09:29 +0100)
tree89ffc1783455694637c2bfa12b16b669ee3132f1
parentb48da39ed487b41d6fcfb5eb07c79ed2a880f0bd
parentd4521768854f2cc6a5d04b94e541be140c891fe8
Merge branch 'maint'
lisp/org-feed.el