Merge branch 'maint'
commitb77a026a24edc0fdb15d2064eeba2d674c7eccd3
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Sun, 27 Jul 2014 12:28:53 +0000 (27 14:28 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Sun, 27 Jul 2014 12:28:53 +0000 (27 14:28 +0200)
tree1b1cfd5713c13e998a08d5d7d911f4b326e39da6
parent46a4590524c823b08529b5fb842b665965ef5acd
parent2160b3d2422fb877fbcc6283ae561a9c59b5621a
Merge branch 'maint'
lisp/ox.el
testing/lisp/test-ox.el