Merge branch 'maint'
commite658b07c8aa2a73635d94b958c992e9f60515c31
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Mon, 10 Aug 2015 20:36:02 +0000 (10 22:36 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Mon, 10 Aug 2015 20:36:02 +0000 (10 22:36 +0200)
treee02f23bcb19b58d4338ec4eeffde9eb5b2e2eb32
parentcaf762e9bcc7e762a59a99805f666918fa871465
parentaa98f7c79a958da8adfc3788f564a1b387d3550d
Merge branch 'maint'
lisp/org.el