Merge branch 'maint'
commitc78a62c9184d27cfac0f6be6e961fee480a06b23
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Mon, 3 Nov 2014 20:10:53 +0000 (3 21:10 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Mon, 3 Nov 2014 20:10:53 +0000 (3 21:10 +0100)
tree83d7f5fbb5c068a5c2b717ec1850b82fc1a21a3a
parent407384772967c5b126c7230f4322f75750d98a80
parent4508b8c2a7f2bf3928967adb1cab20aff466e5bd
Merge branch 'maint'
lisp/org.el