Merge branch 'maint'
commit36cc7b4983cdc93c874a56bc3d0f958c0d91e997
authorNicolas Goaziou <n.goaziou@gmail.com>
Thu, 2 Feb 2012 09:03:42 +0000 (2 10:03 +0100)
committerNicolas Goaziou <n.goaziou@gmail.com>
Thu, 2 Feb 2012 09:03:42 +0000 (2 10:03 +0100)
tree4ec00b76ee8ef29538b9aaf7c2a2ff98803284c7
parenta3e5f97ee7ba27473b25f7e42e317e74629ce2d6
parentb032a6d51bbd0c8e1be4f20dd68abfe52b328e25
Merge branch 'maint'
lisp/org-footnote.el