Merge branch 'maint'
commitecf20715e2efda514e7ae7432d666d4b644711c3
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 1 Jun 2016 12:54:20 +0000 (1 14:54 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 1 Jun 2016 12:54:20 +0000 (1 14:54 +0200)
treee3cb9efff9dff08e8aeedceb96a3b1d366c2d047
parent319c05f1dcef86840211785f4f8498682d3a6cae
parent1f3d72e8b450172218b728b57004837db5d1f1ee
Merge branch 'maint'
lisp/org.el
testing/lisp/test-org.el