Merge branch 'maint'
commit7a14bd172cca096eb8e4710fcb8c40db41e697fa
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Sun, 28 Aug 2016 10:02:51 +0000 (28 12:02 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Sun, 28 Aug 2016 10:02:51 +0000 (28 12:02 +0200)
tree825826df4b6c939a23638046f6efd4dd9b7d0300
parent3b3fc520aaaa5467f634219e16dfd5188532141d
parentb7c144a104641c2680ec8bd1f3092698fcca038c
Merge branch 'maint'
lisp/org.el
lisp/ox-html.el