Merge branch 'maint'
commit21797c31858cc0dac40ee7f4dd33afd59a5ebbf9
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Sat, 18 Feb 2017 13:57:04 +0000 (18 14:57 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Sat, 18 Feb 2017 13:57:04 +0000 (18 14:57 +0100)
tree4407f1bcf93f4121cf123a44d9a9c72e85da349b
parentf745f93fd211815311719bfe53a4dc0f59671203
parent70872885be739dfeed9dd834927e0f182879b87f
Merge branch 'maint'
lisp/org-src.el