Merge branch 'maint'
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Sat, 16 Aug 2014 14:22:48 +0000 (16 16:22 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Sat, 16 Aug 2014 14:22:48 +0000 (16 16:22 +0200)
1  2 
lisp/ox-md.el

diff --cc lisp/ox-md.el
Simple merge