Merge branch 'maint'
authorNicolas Goaziou <n.goaziou@gmail.com>
Sun, 3 Nov 2013 10:38:28 +0000 (3 11:38 +0100)
committerNicolas Goaziou <n.goaziou@gmail.com>
Sun, 3 Nov 2013 10:38:28 +0000 (3 11:38 +0100)
1  2 
lisp/ox.el

diff --cc lisp/ox.el
Simple merge