Merge remote-tracking branch 'origin/hotfix-7.8.06'
commit3f427d92c89a979b6948782ee133a85b8c167660
authorJambunathan K <kjambunathan@gmail.com>
Fri, 20 Apr 2012 17:45:06 +0000 (20 23:15 +0530)
committerJambunathan K <kjambunathan@gmail.com>
Fri, 20 Apr 2012 17:45:06 +0000 (20 23:15 +0530)
tree8bc194e632ade705e6988573d605b27b0d9a8359
parent6f78edd68c78ff1cf5d85c3fa337ca4c048389a8
parent7d4e7a8763eff82e11253deba0dbd148db87f2c8
Merge remote-tracking branch 'origin/hotfix-7.8.06'
etc/styles/OrgOdtStyles.xml
lisp/org-odt.el