Merge branch 'maint'
commitb5c9de618e9a89b339505c6b8643b7e7bf46f9d7
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Mon, 8 Sep 2014 10:10:28 +0000 (8 12:10 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Mon, 8 Sep 2014 10:10:28 +0000 (8 12:10 +0200)
tree28e530bd024034764d53ffe3397ff7c550e193ea
parentd4281e5f3fe3b738e66d794e934d97f1337aedd9
parent7c48bdd7a803ae11970e367bfbf49dcf1ab2314e
Merge branch 'maint'
lisp/ox.el
testing/lisp/test-ox.el