Merge branch 'maint'
commitbaa7321d173636283a398b94d38298d1322bf3b8
authorNicolas Goaziou <n.goaziou@gmail.com>
Fri, 2 Mar 2012 21:38:26 +0000 (2 22:38 +0100)
committerNicolas Goaziou <n.goaziou@gmail.com>
Fri, 2 Mar 2012 21:38:26 +0000 (2 22:38 +0100)
tree499c2a46b69df8767673c1fd465d1abdc8a23a1e
parent15d2a7f3d4f439ac4fb7b380a8c2c19a1b6a9360
parent6b91eb9e657ab0a91c2df6d0081b302af20f083a
Merge branch 'maint'
lisp/org-footnote.el