Merge branch 'maint'
commitfac4677e510d54956b9736e1db5a89b5aebed128
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 10 Oct 2014 09:11:06 +0000 (10 11:11 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 10 Oct 2014 09:11:06 +0000 (10 11:11 +0200)
treea3c91f3eab766724d68db157fa67842aae021174
parent780db69cdf2f805d386f682c304aee77d78e15ca
parent88457acff411eca9b32c04b4bc100ef094a23c5c
Merge branch 'maint'
lisp/ox.el