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)
commitf14abf1880202fadf7e78afffc110d51142e5062
tree041e09ee30e67dc796f3aeb1d1a4b69e33830096
parentf3ed7e875b039b442d5a8615e5a03253516ca067
parent83af6f099d42227806ecfa42476c36d632ba6c75
Merge pull request #5130 from totten/master-mailing-misc2

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