Merge branch 'maint'
commit2829fdad0be5f3a5d294ab73dcc8357f7cae6feb
authorBastien Guerry <bzg@altern.org>
Tue, 8 Oct 2013 06:08:11 +0000 (8 08:08 +0200)
committerBastien Guerry <bzg@altern.org>
Tue, 8 Oct 2013 06:08:11 +0000 (8 08:08 +0200)
treeee4364e9c7a6687e2c2bb0213c01578ba5b997e2
parent379e2b1beaa4a6c83b3856ac5eb1256bb279a7be
parent0eb0e5778bb61d6364acd6a11516c7e4df3b3b62
Merge branch 'maint'
contrib/lisp/ox-rss.el