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