Merge branch 'maint'
commit2b5670d453f36f3596a2d6ed46ed9c2a0cf88072
authorBastien Guerry <bzg@altern.org>
Tue, 23 Jul 2013 16:52:02 +0000 (23 18:52 +0200)
committerBastien Guerry <bzg@altern.org>
Tue, 23 Jul 2013 16:52:02 +0000 (23 18:52 +0200)
tree51d20e777cfefbebc1e5599ffc62a3d562094b20
parent555c0520cad9009ddaedfe813e3a8a1eb5ad57f0
parent89f2450fe567cf8c1a75f0a48a98b18976025f90
Merge branch 'maint'
contrib/lisp/ox-rss.el