Merge branch 'maint'
commita3375f3432677ed091a90fbdf33a7747ab1a8e2d
authorNicolas Goaziou <n.goaziou@gmail.com>
Wed, 31 Jul 2013 12:45:09 +0000 (31 14:45 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Wed, 31 Jul 2013 12:45:09 +0000 (31 14:45 +0200)
tree9c89a60ad5164e9410e974f5514559055448c915
parent483977e016334088acdbe743b266f9e102e50d9e
parentcc10c80d8504d1be59521e291923179170cb3792
Merge branch 'maint'
lisp/ox.el