Merge branch 'maint'
commitd87158ba2a568758856638540f61394763d2e9c9
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Sat, 16 Apr 2016 09:38:25 +0000 (16 11:38 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Sat, 16 Apr 2016 09:38:25 +0000 (16 11:38 +0200)
treef188ed734706b115e6f79db62f5501f49a9c07a2
parentda9fb9eacd17f768501cfd1ffcddd216b70f8ff4
parente0acd8a15a40cb15bd5c5c26c5a345900762c2f1
Merge branch 'maint'
lisp/org.el