Merge branch 'maint'
commit94232ab5c67feeffc05f3abd1d43262674e9d006
authorNicolas Goaziou <n.goaziou@gmail.com>
Tue, 16 Oct 2012 19:12:21 +0000 (16 21:12 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Tue, 16 Oct 2012 19:12:21 +0000 (16 21:12 +0200)
tree42f192d94becdfc5a1b73b6bfed3d8c197afc2bf
parent93ebf24758b26496e87c680f4d7eef0badb9e7fc
parent8f96754932e8be63335c8565cec2d34f46f54078
Merge branch 'maint'
lisp/org.el
testing/lisp/test-org.el