Merge branch 'maint'
authorNicolas Goaziou <n.goaziou@gmail.com>
Sat, 18 May 2013 16:26:56 +0000 (18 18:26 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Sat, 18 May 2013 16:26:56 +0000 (18 18:26 +0200)
1  2 
lisp/ox.el

diff --cc lisp/ox.el
Simple merge