Merge branch 'maint-fixes' into maint
commit1b4e396b6b2b015b67784eca7f046e177208c4b3
authorBastien Guerry <bzg@altern.org>
Mon, 24 Dec 2012 13:01:25 +0000 (24 14:01 +0100)
committerBastien Guerry <bzg@altern.org>
Mon, 24 Dec 2012 13:01:25 +0000 (24 14:01 +0100)
treebce5acec9d23cacca6966b508038787693e58b1b
parentb63275350f524df5e33c2aa915de4415f312f409
parent58999598edf58805760ec3b81370b1dc68a5adcc
Merge branch 'maint-fixes' into maint
lisp/org-compat.el
lisp/org-odt.el