Merge remote-tracking branch 'origin/maint'
commit963b1c53bb76f431eb9bf1d5dd52c033791924a6
authorJambunathan K <kjambunathan@gmail.com>
Wed, 11 Jul 2012 19:29:52 +0000 (12 00:59 +0530)
committerJambunathan K <kjambunathan@gmail.com>
Wed, 11 Jul 2012 19:29:52 +0000 (12 00:59 +0530)
treed9465fdc80d56d7dee5b7eb862d78dedf6ce82de
parentbe56d706aebab0c3d0d372354f699b6f3d1893ff
parent73165e8ba54df0263e46029f336bfcc0929b0e99
Merge remote-tracking branch 'origin/maint'
lisp/org-odt.el