Merge branch 'maint'
commit9b7f43768fee48dcebcd75827b9dc9ea2bd7e9cb
authorNicolas Goaziou <n.goaziou@gmail.com>
Sun, 28 Jul 2013 19:33:24 +0000 (28 21:33 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Sun, 28 Jul 2013 19:33:24 +0000 (28 21:33 +0200)
treea20770616543d6590f9e292c9fff60d6570e49e9
parentaef1b177737238d9df6991d28dc5ff36934de72d
parent17ba41434e451aeb3d0e9efdad65b3d21f9467d9
Merge branch 'maint'
lisp/ox.el