Merge branch 'maint'
commitb9b500afd9cfe2cf8dc81ab44d859530e0939dd8
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 14 Aug 2015 20:36:51 +0000 (14 22:36 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 14 Aug 2015 20:36:51 +0000 (14 22:36 +0200)
treefa3bc024c69eacadb273b027f1392cf9f4280187
parentfc7ce0777d843dc5689e8859990ffb1fa6ae740a
parent80b1ebc6812275da3224e3b184cf3137b3bc2104
Merge branch 'maint'
lisp/org.el