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)
commit419b69a43562fc68b5ab58a5038003397665fbc7
treeaade88138bb5abb4b56a88a2e6bfe603be03eae8
parent6e6b1044dc65e5d30515b6801e15ef283129dc6f
parent4daf9d60d913da6d4d086b05b38974779859a52d
Merge branch 'maint'
lisp/ox.el