Merge pull request #8193 from colemanw/scardinius-issue-CRM-16911

author colemanw <coleman@civicrm.org>

Wed, 20 Apr 2016 20:00:25 +0000 (16:00 -0400)

committer colemanw <coleman@civicrm.org>

Wed, 20 Apr 2016 20:00:25 +0000 (16:00 -0400)
author colemanw <coleman@civicrm.org>
Wed, 20 Apr 2016 20:00:25 +0000 (16:00 -0400)
committer colemanw <coleman@civicrm.org>
Wed, 20 Apr 2016 20:00:25 +0000 (16:00 -0400)
diff --cc ang/crmMailing/services.js
Simple merge
diff --cc api/v3/Mailing.php

index 06ada98cbab1e626705887542f3cdeceb0f871e1,84640a084b8641e962d3cae078ff30bda2dfab6a..0a418e9a728661dca3e55ffd09979bda51910596

mode 100644,100755..100644
--- 1/api/v3/Mailing.php
--- 2/api/v3/Mailing.php
+++ b/api/v3/Mailing.php
author	colemanw <coleman@civicrm.org>
	Wed, 20 Apr 2016 20:00:25 +0000 (16:00 -0400)
committer	colemanw <coleman@civicrm.org>
	Wed, 20 Apr 2016 20:00:25 +0000 (16:00 -0400)
		1	2
ang/crmMailing/services.js	patch \|	diff1 \|	diff2 \|	blob \| history
api/v3/Mailing.php	patch \|	diff1 \|	diff2 \|	blob \| history