Merge branch 'maint'
commita0e3f1d5050ffd0d03c68b35b2b5300fb89da1f0
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Sun, 3 Dec 2017 17:14:48 +0000 (3 18:14 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Sun, 3 Dec 2017 17:14:48 +0000 (3 18:14 +0100)
tree637eb39e3d20a2fa2a149fa51c6c9fb5d5ca8065
parent7fc901ca0f030166eb8de781c3bb1b41a1fa3f86
parent037db00f40b6b00c05f32e13fd5bf61f2d1b04cc
Merge branch 'maint'
lisp/org.el