Merge branch 'hotfix'
commitd17761a05a514037751cae34ef8bedd204b19db9
authorNicolas Goaziou <n.goaziou@gmail.com>
Fri, 20 Apr 2012 09:16:33 +0000 (20 11:16 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Fri, 20 Apr 2012 09:16:33 +0000 (20 11:16 +0200)
tree82e3e981297c5c7187bb12095adc6bc9cfeca2dc
parentdbc6fd1ebf5ca6a17f30d205c0d5db2f608d966e
parent8b18c50d4cfc78072c6306709976fa2b19ef6044
Merge branch 'hotfix'
lisp/org-footnote.el