Merge branch 'maint'
commitb95d7842f2638e7db59a4932c305a3f8ec6dfd50
authorNicolas Goaziou <n.goaziou@gmail.com>
Sat, 3 Aug 2013 07:45:42 +0000 (3 09:45 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Sat, 3 Aug 2013 07:45:42 +0000 (3 09:45 +0200)
tree1b546cfdf0f2faf938bb8bccb04469c9917a24a4
parent6db74e8d5c7ddb310185dfba6c13ed825b702fb5
parentf5161671ceb882b7a946d0632fbbf5c380952556
Merge branch 'maint'
lisp/ox.el