Merge branch 'maint'
commit089a13b2f3a107aac9df57b109b3bdd9aac0f3a4
authorNicolas Goaziou <n.goaziou@gmail.com>
Mon, 12 May 2014 20:21:33 +0000 (12 22:21 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Mon, 12 May 2014 20:21:33 +0000 (12 22:21 +0200)
tree8ce79391fb83e891ada4723896d14d75210e1be2
parent08e25967188f20ba92f6d0901212c9670b4724f9
parente242bc51803005cfeb68e7bf3e645d2e813f2857
Merge branch 'maint'
lisp/ox.el