Merge branch 'maint'
commit646b3f846a6724e49206b8bac405a416af2ef970
authorNicolas Goaziou <n.goaziou@gmail.com>
Tue, 31 Jan 2012 19:23:07 +0000 (31 20:23 +0100)
committerNicolas Goaziou <n.goaziou@gmail.com>
Tue, 31 Jan 2012 19:23:07 +0000 (31 20:23 +0100)
tree8e22f8c2aeb839ae0f115da55f1906687ef19ff0
parent171ead5dc88f0cc19b2e84088411971e0285e428
parent182970cf8e680943483fcece79d17070b783bb72
Merge branch 'maint'
lisp/org-exp.el