Merge branch 'maint'
commit39fc2c445abe6f05fa097d54742b37c23a8ff39f
authorNicolas Goaziou <n.goaziou@gmail.com>
Tue, 1 May 2012 13:33:36 +0000 (1 15:33 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Tue, 1 May 2012 13:33:36 +0000 (1 15:33 +0200)
treef5c40ef518844b12056c846f671232925184d1eb
parent32a5920e69d3d85af0251e4d0078ed116d91088d
parenteed9350ed93a539600f25b4900c408f0255cdace
Merge branch 'maint'
lisp/org.el