Merge branch 'maint'
commit6987059a205cae5d0470115322539876ed2868c8
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Mon, 25 Aug 2014 13:34:14 +0000 (25 15:34 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Mon, 25 Aug 2014 13:34:14 +0000 (25 15:34 +0200)
tree37f7430298539f24a8d59b8624a351a8a2a671a4
parentc33afd56837c2c518c6e96d9585a5475a2318ff5
parent409913b253de2de1b49f9468a4b77b9292e090c4
Merge branch 'maint'
lisp/org.el