Merge pull request #5164 from totten/master-recip-opt
authorTim Otten <totten@civicrm.org>
Sat, 14 Feb 2015 03:53:39 +0000 (19:53 -0800)
committerTim Otten <totten@civicrm.org>
Sat, 14 Feb 2015 03:53:39 +0000 (19:53 -0800)
CRM-15857, CRM-15361 - crmMailing - Display recipient addressing options


Trivial merge