Merge branch 'maint'
commit2402d7a192e266026454030033f5fcf887ca8d4b
authorNicolas Goaziou <n.goaziou@gmail.com>
Sat, 4 Feb 2012 15:38:02 +0000 (4 16:38 +0100)
committerNicolas Goaziou <n.goaziou@gmail.com>
Sat, 4 Feb 2012 15:38:02 +0000 (4 16:38 +0100)
tree8105f59409fdddc80f4691f0fe0f8133a6a8dbc6
parentd2fbf45c827796ef84d9224da83482b485efbfee
parentdc5d61f03ad278a49a52410788e1b5435a011603
Merge branch 'maint'
lisp/org.el