Merge branch 'master' into master-civimail-abtest
authorTim Otten <totten@civicrm.org>
Sat, 20 Dec 2014 14:18:08 +0000 (06:18 -0800)
committerTim Otten <totten@civicrm.org>
Sat, 20 Dec 2014 14:18:08 +0000 (06:18 -0800)
commita335f6b228626e3e1b2f1549c8ddcbb9232b3c6b
tree545dba08315fab35fb4d4c2a4c7241a43b71c23c
parent1a45b74f6c665dc3688beac3a5ce1734e60e965a
parent8c17c169f4420618899e194fb2deb7faf04a8d12
Merge branch 'master' into master-civimail-abtest

Conflicts:
CRM/Mailing/BAO/Mailing.php
CRM/Mailing/BAO/MailingJob.php
CRM/Upgrade/Incremental/sql/4.6.alpha1.mysql.tpl
CRM/Utils/Array.php
sql/civicrm_generated.mysql
tests/phpunit/CiviTest/CiviUnitTestCase.php
24 files changed:
CRM/Core/Error.php
CRM/Core/Permission/UnitTests.php
CRM/Mailing/BAO/Mailing.php
CRM/Mailing/BAO/MailingJob.php
CRM/Mailing/BAO/Recipients.php
CRM/Mailing/BAO/TrackableURL.php
CRM/Mailing/Controller/Send.php
CRM/Mailing/Event/BAO/Bounce.php
CRM/Mailing/Event/BAO/Delivered.php
CRM/Mailing/Event/BAO/Opened.php
CRM/Mailing/Event/BAO/Queue.php
CRM/Mailing/Event/BAO/TrackableURLOpen.php
CRM/Mailing/Event/BAO/Unsubscribe.php
CRM/Upgrade/Incremental/sql/4.6.alpha1.mysql.tpl
CRM/Utils/Array.php
Civi/API/Kernel.php
api/v3/MailingGroup.php
api/v3/utils.php
css/civicrm.css
js/Common.js
sql/civicrm_generated.mysql
tests/phpunit/CiviTest/CiviUnitTestCase.php
tests/phpunit/api/v3/SyntaxConformanceTest.php
xml/templates/civicrm_data.tpl