Merge branch 'maint'
commit0f51e643c4f1c5b4e232c4c9dae115e0cb51845a
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 23 Mar 2017 15:46:52 +0000 (23 16:46 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 23 Mar 2017 15:46:52 +0000 (23 16:46 +0100)
tree75c0d309de11e8f1e3a575f71460c2c4cbbe790b
parent1d35684c564f6d19cf188cab6a0abf4a35db38b3
parentb791cd59a534e06664fc21a5648fcbbbc0d1a189
Merge branch 'maint'
lisp/ox.el
testing/lisp/test-ox.el