Merge branch 'maint'
commitbd3bd83092d1bdd0019d809bb11a418735352720
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Tue, 25 Nov 2014 08:24:02 +0000 (25 09:24 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Tue, 25 Nov 2014 08:24:02 +0000 (25 09:24 +0100)
tree0be66b1f26b6a99a1576080533c6f9cdbddc117a
parent9eff31aadafcdaed3793352f2583b452eef14070
parenta712cec60fbb9a3384f209f96d43b8e3dfd2d9ce
Merge branch 'maint'
lisp/org.el