Merge branch 'maint'
commit221768a768798717444505ceb2b3a0946102c04a
authorNicolas Goaziou <n.goaziou@gmail.com>
Wed, 5 Jun 2013 12:24:58 +0000 (5 14:24 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Wed, 5 Jun 2013 12:24:58 +0000 (5 14:24 +0200)
treedad6175e9ad1b45f7ce7052949de6eb722d21afa
parentd7e884d86c8560477ca1e69fb8423db6770981ac
parent4b7006f444950811a1266feaf5b36d24d7a04cbf
Merge branch 'maint'
lisp/ox.el