Merge branch 'maint'
commit754a72eb2ab79ca660a8c3499d3051814d7788a8
authorNicolas Goaziou <n.goaziou@gmail.com>
Thu, 29 Aug 2013 08:22:09 +0000 (29 10:22 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Thu, 29 Aug 2013 08:22:09 +0000 (29 10:22 +0200)
treee7c4e5a847742592670513ff72360247285e9321
parent718e1ec3c4bd9778ed5ef2a1f719576432a57b51
parent8c833ed9fbabae298054dd9eec574984acf3ab8b
Merge branch 'maint'
lisp/ox.el