Merge branch 'maint'
commit7dc2babf29023cd33e627169ef5a61e1f18f6993
authorNicolas Goaziou <n.goaziou@gmail.com>
Sun, 12 May 2013 18:45:01 +0000 (12 20:45 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Sun, 12 May 2013 18:45:01 +0000 (12 20:45 +0200)
tree61af01b36dfb278382ae98a5a0fb21e56f558b84
parentd542097aa3870dd80d1a1a2700b486f3086bca6e
parent48e51fe5d98890c2af0b8ecc28cc001a344a5259
Merge branch 'maint'
lisp/ox.el