Merge pull request #5130 from totten/master-mailing-misc2
authorTim Otten <totten@civicrm.org>
Wed, 11 Feb 2015 21:02:50 +0000 (13:02 -0800)
committerTim Otten <totten@civicrm.org>
Wed, 11 Feb 2015 21:02:50 +0000 (13:02 -0800)
CRM-15856 - Mailing API - Enforce required mail-merge tokens.


Trivial merge