Merge branch 'maint'
commitf00d759765bfa94adeea53eed23bb642424d04e6
authorBastien Guerry <bzg@altern.org>
Wed, 24 Jul 2013 08:28:22 +0000 (24 10:28 +0200)
committerBastien Guerry <bzg@altern.org>
Wed, 24 Jul 2013 08:28:22 +0000 (24 10:28 +0200)
treebdd0dbde148724a84eb93211f35f770832c4d86d
parentc815fe55cd06e3506623fce8b016afb1375c7dbd
parent1ea4c31eea291b157bcaec7ea09517b486126506
Merge branch 'maint'
contrib/lisp/ox-rss.el