Merge branch 'maint'
commitd73ff5fd61614ae6e3937aa588e790b3f9a2cd95
authorNicolas Goaziou <n.goaziou@gmail.com>
Sun, 28 Jul 2013 19:40:37 +0000 (28 21:40 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Sun, 28 Jul 2013 19:40:37 +0000 (28 21:40 +0200)
tree4d417ce2e8ebef3f6de399975e45d62e00d15265
parent9b7f43768fee48dcebcd75827b9dc9ea2bd7e9cb
parent33a2c7ea682f3e443211969928b129d87e01758f
Merge branch 'maint'
lisp/ox.el