Merge branch 'maint'
commit76cf2538bb886aef49badaec8472e5743ad90770
authorNicolas Goaziou <n.goaziou@gmail.com>
Tue, 18 Dec 2012 18:33:47 +0000 (18 19:33 +0100)
committerNicolas Goaziou <n.goaziou@gmail.com>
Tue, 18 Dec 2012 18:33:47 +0000 (18 19:33 +0100)
tree0614bf79d35a6661f086018952bdbf71429b7b89
parent0f3264f690bb6f06ceba5db29c33c5420e84e8df
parent7739e8b5f7d81319b647043c2a9f6d9ef7eb813b
Merge branch 'maint'
lisp/org.el