Merge pull request #8474 from monishdeb/CRM-17608
authorcolemanw <coleman@civicrm.org>
Tue, 19 Jul 2016 18:49:01 +0000 (14:49 -0400)
committerGitHub <noreply@github.com>
Tue, 19 Jul 2016 18:49:01 +0000 (14:49 -0400)
CRM-17608: Merge to DOCx or ODT template


Trivial merge