Merge branch 'maint'
commitdaa687411d1d464588d372b6e022886c544a4024
authorNicolas Goaziou <n.goaziou@gmail.com>
Sat, 3 Mar 2012 12:01:59 +0000 (3 13:01 +0100)
committerNicolas Goaziou <n.goaziou@gmail.com>
Sat, 3 Mar 2012 12:01:59 +0000 (3 13:01 +0100)
tree94fe399e1d3ae8b1cce7e0785aa62f69b4cee29f
parentbaa7321d173636283a398b94d38298d1322bf3b8
parentc8020dd42e8b7d8d433948bacd1ac2b03fed2dc2
Merge branch 'maint'
lisp/org-footnote.el