From: colemanw <coleman@civicrm.org>
Date: Tue, 19 Jul 2016 18:49:01 +0000 (-0400)
Subject: Merge pull request #8474 from monishdeb/CRM-17608
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=5ae39bbf5ca5730fa4697c269ac81efd1f99068a;p=civicrm-core.git

Merge pull request #8474 from monishdeb/CRM-17608

CRM-17608: Merge to DOCx or ODT template
---

5ae39bbf5ca5730fa4697c269ac81efd1f99068a