Merge branch 'maint'
commit18f0835840285f7f496541436c6a16b41d8222ff
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Mon, 30 Nov 2015 15:09:19 +0000 (30 16:09 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Mon, 30 Nov 2015 15:09:19 +0000 (30 16:09 +0100)
treedaae61f9be768be010c1547e3aaa73c4d6167550
parent2aa80849daecaf3c88815ac08d70269b9effb0ca
parent54c584738564661a916e3c1a223c8ddab7e29f48
Merge branch 'maint'
lisp/org-footnote.el