Merge branch 'maint'
commit6de9f14cf57f06302db0485c9ad90f3c7cc505d9
authorNicolas Goaziou <n.goaziou@gmail.com>
Thu, 2 Feb 2012 19:41:20 +0000 (2 20:41 +0100)
committerNicolas Goaziou <n.goaziou@gmail.com>
Thu, 2 Feb 2012 19:41:20 +0000 (2 20:41 +0100)
tree95cf0edea206797daa06060806a8f54a3fc2c791
parentefc10c9286040790f31ae5103ea8a49e446bd31e
parentacd743bdc0a42ce2935e67e15a1da49ca5fa4416
Merge branch 'maint'
lisp/org-footnote.el