Merge branch 'maint'
commitaee808987da50fbf44fb762519914ae6bd458876
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 5 Feb 2016 22:01:32 +0000 (5 23:01 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 5 Feb 2016 22:01:32 +0000 (5 23:01 +0100)
treef324c1a64d963b4dcbb5c2b804b1266c14daa26d
parent422c5ca3b9798ef76570c332eea9c45ab91ab504
parentcadfbbe8af9b978a02f48ee70bf6c855fdd3e19d
Merge branch 'maint'
lisp/org.el