Merge branch 'maint'
commite30e13b8c75a90a5d5057f76b9ef69f4420d7821
authorNicolas Goaziou <n.goaziou@gmail.com>
Thu, 2 Feb 2012 20:26:21 +0000 (2 21:26 +0100)
committerNicolas Goaziou <n.goaziou@gmail.com>
Thu, 2 Feb 2012 20:26:21 +0000 (2 21:26 +0100)
tree20d4917ec6d9e82663096b238f01cacfa59d64d5
parent6de9f14cf57f06302db0485c9ad90f3c7cc505d9
parentd10792510f8eed98bd342b6dbe974bd781bc8ecc
Merge branch 'maint'
lisp/org-footnote.el