Merge branch 'maint'
commitcf6d9367014aaafabb0c4081311d68e094081b35
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Sun, 23 Aug 2015 21:51:07 +0000 (23 23:51 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Sun, 23 Aug 2015 21:51:07 +0000 (23 23:51 +0200)
treead3d7cf90d3dad05aff7c931ab4062393e168256
parent4bc8008e8b527a9dd1564eb7ec36a2ec4ca51331
parentcd1d623b8541a370cd72f35a1fd94bd6681de8ce
Merge branch 'maint'
lisp/ox.el