Merge branch 'maint'
commita3fab8d8990897be8ec243e13f514745b7a03824
authorNicolas Goaziou <n.goaziou@gmail.com>
Fri, 17 Jan 2014 21:17:39 +0000 (17 22:17 +0100)
committerNicolas Goaziou <n.goaziou@gmail.com>
Fri, 17 Jan 2014 21:17:39 +0000 (17 22:17 +0100)
treec8e5937664cc89d20a51c3542670b711a8c13e4b
parentcd7adb47d85f6c7d2ddedd33b966d873685b55d3
parentb0ac2f6ac00ece71d01bc160746ccc863cc0e5d9
Merge branch 'maint'
lisp/ox.el