Merge remote-tracking branch 'rajgo94/mailingui-new' into master-abtest
authorTim Otten <totten@civicrm.org>
Wed, 29 Oct 2014 00:09:15 +0000 (17:09 -0700)
committerTim Otten <totten@civicrm.org>
Wed, 29 Oct 2014 00:09:15 +0000 (17:09 -0700)
commit6bea4a4706bcc7a956ccbcb75b7c9b1fd44816c7
tree160a2c4fcf1ce28fb7ce16f9d6530ea62d6814b4
parent9c41996008a0cb938cd30d8996cdec462c6a61a7
parentf97e242624da09f397a547c8053895304ec1ab97
Merge remote-tracking branch 'rajgo94/mailingui-new' into master-abtest

Conflicts:
CRM/Mailing/Event/BAO/Delivered.php
CRM/Mailing/Info.php
api/v3/Mailing.php
api/v3/MailingGroup.php
js/angular-crmCaseType.js
tests/phpunit/api/v3/MailingTest.php
CRM/Mailing/BAO/Mailing.php
CRM/Mailing/Info.php
api/v3/Mailing.php
api/v3/MailingGroup.php