Merge branch 'maint'
commit985ffb13d272be71212644a8b565959b48b29e43
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Tue, 17 Jan 2017 08:53:36 +0000 (17 09:53 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Tue, 17 Jan 2017 08:53:36 +0000 (17 09:53 +0100)
treed7098de9ee2a53a2cf19d9f082a31e358455e1c7
parentfe9e60d61b91c3186521d7100347413f94a07c34
parentc31462f33e73e37cb076bf4292c80702589cddd9
Merge branch 'maint'
lisp/org.el
testing/lisp/test-org.el