Merge pull request #9874 from totten/master-acttok
authorTim Otten <totten@civicrm.org>
Tue, 28 Feb 2017 02:25:55 +0000 (18:25 -0800)
committerGitHub <noreply@github.com>
Tue, 28 Feb 2017 02:25:55 +0000 (18:25 -0800)
(Regression) CRM_Mailing_ActionTokens - Degrade gracefully


Trivial merge