Merge branch 'maint'
authorNicolas Goaziou <n.goaziou@gmail.com>
Mon, 20 May 2013 09:34:59 +0000 (11:34 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Mon, 20 May 2013 09:34:59 +0000 (11:34 +0200)
1  2 
lisp/ox.el

diff --cc lisp/ox.el
Simple merge