Merge branch 'maint'
commit36b95d44918f2d45f15ea057d97bf4dea4e00dbe
authorBastien Guerry <bzg@altern.org>
Tue, 2 Oct 2012 15:58:00 +0000 (2 17:58 +0200)
committerBastien Guerry <bzg@altern.org>
Tue, 2 Oct 2012 15:58:00 +0000 (2 17:58 +0200)
treee0844432649fb64b7c790bf0bf9954764b7fc848
parent30235e67733cd3cc4621916ca9231ad96ca85c10
parent79e907fd8c2a650e17f9703f7332dab51d534b8f
Merge branch 'maint'
contrib/lisp/org-e-odt.el