Merge branch 'maint'
commitc4b233453ca846351bb5ba0893ebb2b8a5b3a941
authorNicolas Goaziou <n.goaziou@gmail.com>
Tue, 7 Feb 2012 07:43:41 +0000 (7 08:43 +0100)
committerNicolas Goaziou <n.goaziou@gmail.com>
Tue, 7 Feb 2012 07:43:41 +0000 (7 08:43 +0100)
tree4e8cac029ca736b271192be817aa49a38092fb37
parent678de3fdf021e748c085b2360b5432b35931f019
parentb3721c2a662cfea5f5fcaee1d68cde8324afd591
Merge branch 'maint'
lisp/org-footnote.el