Merge branch 'maint'
commit854ddf635c517aed0c742fbcb63c1489bb87b4b6
authorNicolas Goaziou <n.goaziou@gmail.com>
Mon, 5 Nov 2012 16:40:48 +0000 (5 17:40 +0100)
committerNicolas Goaziou <n.goaziou@gmail.com>
Mon, 5 Nov 2012 16:40:48 +0000 (5 17:40 +0100)
treec1022c6ea6cb8eb8c6b7f018687dca09b75dca8f
parent1896fc352f3447a4f7c636d5e5c1630b578717cf
parentc20730be9aef8c5389aaaef08664515b0a749bd9
Merge branch 'maint'
lisp/org.el