Merge branch 'maint'
authorNicolas Goaziou <n.goaziou@gmail.com>
Sun, 19 May 2013 07:54:18 +0000 (09:54 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Sun, 19 May 2013 07:54:18 +0000 (09:54 +0200)
1  2 
lisp/ox.el

diff --cc lisp/ox.el
Simple merge