From: Tim Otten <totten@civicrm.org>
Date: Wed, 11 Feb 2015 21:02:50 +0000 (-0800)
Subject: Merge pull request #5130 from totten/master-mailing-misc2
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=f14abf1880202fadf7e78afffc110d51142e5062;p=civicrm-core.git

Merge pull request #5130 from totten/master-mailing-misc2

CRM-15856 - Mailing API - Enforce required mail-merge tokens.
---

f14abf1880202fadf7e78afffc110d51142e5062