Merge origin/maint
commitf4148cf525a073de275e772d4a834ea2e219421d
authorJambunathan K <kjambunathan@gmail.com>
Thu, 19 Jul 2012 13:59:24 +0000 (19 19:29 +0530)
committerJambunathan K <kjambunathan@gmail.com>
Thu, 19 Jul 2012 13:59:24 +0000 (19 19:29 +0530)
treec90564e9a6e7ab2e025988fe41d73210b5f18d09
parent070e03011d0c1fc4d8fcd22fe108e1b606e68f15
parent16d23c07dd3697db790b14e6873c65404c912e3f
Merge origin/maint
lisp/org-compat.el
lisp/org-odt.el