Merge branch 'maint'
commiteaa458594f017640c8102a29daa686df5dce81b1
authorNicolas Goaziou <n.goaziou@gmail.com>
Thu, 29 Aug 2013 08:43:19 +0000 (29 10:43 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Thu, 29 Aug 2013 08:43:19 +0000 (29 10:43 +0200)
tree487d631934b656bf7ea53039a6e61873e81fc905
parent754a72eb2ab79ca660a8c3499d3051814d7788a8
parent180d1123343f47f8c4c06b0095d38458746356e3
Merge branch 'maint'
lisp/ox.el