Merge branch 'maint'
commit6dab0cd71ff4e28534fd4e959c2acaf608377342
authorNicolas Goaziou <n.goaziou@gmail.com>
Sat, 3 Mar 2012 12:08:35 +0000 (3 13:08 +0100)
committerNicolas Goaziou <n.goaziou@gmail.com>
Sat, 3 Mar 2012 12:08:35 +0000 (3 13:08 +0100)
tree009e7dd980b12d911bae4551b3cb4337a9cd1421
parentdaa687411d1d464588d372b6e022886c544a4024
parent155ab73f7767afbf45cf67566d7808dd6684797b
Merge branch 'maint'
lisp/org-footnote.el