Merge branch 'maint'
commit0be044736c312ad6bff65215f2a9020d2ad42cb1
authorNicolas Goaziou <n.goaziou@gmail.com>
Tue, 29 Oct 2013 08:57:48 +0000 (29 09:57 +0100)
committerNicolas Goaziou <n.goaziou@gmail.com>
Tue, 29 Oct 2013 08:57:48 +0000 (29 09:57 +0100)
tree012adf3c84ad2a7aa93c70dd19cf7bf511375817
parent8b264d505ee74b3b215fdc1baf4daf2167e9e2e4
parenta7e5a74e2ce41819a342a282f62541d6e9d61c47
Merge branch 'maint'
lisp/org.el
testing/lisp/test-org.el