Merge branch 'maint'
authorNicolas Goaziou <n.goaziou@gmail.com>
Fri, 9 Nov 2012 01:47:23 +0000 (02:47 +0100)
committerNicolas Goaziou <n.goaziou@gmail.com>
Fri, 9 Nov 2012 01:47:23 +0000 (02:47 +0100)
commit94605246e5d1be0fa03bf18116a0a4a69993bbc1
tree74fbbaee3cd10e65246894290783168b03e55efc
parent01256855533bfed4ae7166d8d9f4acdb90c9ab0e
parent2aeb28d2af6050ef9ef5130b28697fdabe8bf04b
Merge branch 'maint'
lisp/org.el
testing/lisp/test-org.el