Merge branch 'maint'
commit319c05f1dcef86840211785f4f8498682d3a6cae
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Tue, 31 May 2016 22:44:55 +0000 (1 00:44 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Tue, 31 May 2016 22:44:55 +0000 (1 00:44 +0200)
tree38f5f55516e77e348af4b6a51e94f3a9e930efa6
parentba50db8387d4fceb84aa67714d48bd3744f4c7d5
parenta1df8cfe715c56a20b400104aab5c4a3d262c97e
Merge branch 'maint'
lisp/org.el