Merge branch 'maint'
commit642bd253d0ef768e42667071c2da8cc6dc7691b6
authorBastien Guerry <bzg@altern.org>
Wed, 10 Jul 2013 09:53:22 +0000 (10 11:53 +0200)
committerBastien Guerry <bzg@altern.org>
Wed, 10 Jul 2013 09:53:22 +0000 (10 11:53 +0200)
tree1e99a02181f5fdb681303d6416088334fe24d988
parent020eb8eaef35a26641d7c3840229856a7ec27281
parent8eb8082b641ebe9790b6c1d74e2e0a05bcb051b2
Merge branch 'maint'
contrib/lisp/ox-rss.el