Merge branch 'maint'
commit7894129841baa4fabadb590faa986049f4831256
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Mon, 18 Apr 2016 23:37:50 +0000 (19 01:37 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Mon, 18 Apr 2016 23:37:50 +0000 (19 01:37 +0200)
tree1a38e70eecbc6c1cd4d555589d35273e83796afd
parent2a49038fd6d3729fedcef35e5d739cc680719fea
parent77b4fad528076aeeb3afc18da4872758924a2962
Merge branch 'maint'
lisp/org.el