Merge branch 'maint'
commit718e1ec3c4bd9778ed5ef2a1f719576432a57b51
authorNicolas Goaziou <n.goaziou@gmail.com>
Thu, 29 Aug 2013 08:08:24 +0000 (29 10:08 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Thu, 29 Aug 2013 08:08:24 +0000 (29 10:08 +0200)
treedf66b13f6f86ecc69005c1ce518cd85ade23c986
parent895d18abc05fbfa56c0ae2a31e70e74b92888a18
parent2baa2c3afa70f86a6266b4bb9d5f763c5fb18388
Merge branch 'maint'
lisp/ox.el