Merge branch 'maint'
commita34a3345820386d27cc2426659e9b69215196b40
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 9 Sep 2015 20:51:31 +0000 (9 22:51 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 9 Sep 2015 20:51:31 +0000 (9 22:51 +0200)
treee0506e3b1363ca8866666c8f47562a9cc5ca8f4d
parentb293f75e78e67df5c4ba2578a47bec246560e199
parentc708fc0bb82640b8dc3d934c72703d453e1f1fe7
Merge branch 'maint'
lisp/ox.el
testing/lisp/test-ox.el