Merge branch 'maint'
commitf0af36a34850ab4c51bd4bdb27a2e8ccd1d5b946
authorNicolas Goaziou <n.goaziou@gmail.com>
Wed, 29 Feb 2012 22:06:17 +0000 (29 23:06 +0100)
committerNicolas Goaziou <n.goaziou@gmail.com>
Wed, 29 Feb 2012 22:06:17 +0000 (29 23:06 +0100)
tree9bec23dd6ca0cccf446da1e87896e447f3553d6f
parent7fa08ef095ba310708465d4804d705ca0dce0c78
parentf6727a9ddecc638e1d4c079a0fe7faa2618d4a65
Merge branch 'maint'
lisp/org-footnote.el