Merge pull request #6041 from mallezie/crm-16706
authorcolemanw <coleman@civicrm.org>
Tue, 23 Jun 2015 19:19:18 +0000 (15:19 -0400)
committercolemanw <coleman@civicrm.org>
Tue, 23 Jun 2015 19:19:18 +0000 (15:19 -0400)
commit777d4b653e4a553d8a5f7ca5c46bf08a6c4a6902
tree732df3325672a077075f43fb9fa6a4fe8afdfa23
parentd9490d99a02f1a082a01d47720d5f9ce15bca1b5
parent36d27c193b185876821fa65ed3473d3f95cbbc2e
Merge pull request #6041 from mallezie/crm-16706

merge commonLetterCompose() and commonCompose()
CRM/Mailing/BAO/Mailing.php