Merge remote-tracking branch 'origin/abtest' into master-abtest
authorTim Otten <totten@civicrm.org>
Tue, 28 Oct 2014 23:30:34 +0000 (16:30 -0700)
committerTim Otten <totten@civicrm.org>
Tue, 28 Oct 2014 23:30:34 +0000 (16:30 -0700)
commit9c41996008a0cb938cd30d8996cdec462c6a61a7
treeace9d38d817f49d86818ed4b64b80cd7f82a26a8
parentdcaaae9c6fcc467f36c086cd77507b1895c060a5
parent008e95c9827a8cb3a725f7ff1d3de9874b56ba15
Merge remote-tracking branch 'origin/abtest' into master-abtest

Conflicts:
sql/civicrm_generated.mysql
tests/phpunit/CiviTest/CiviUnitTestCase.php
CRM/Mailing/BAO/Mailing.php
CRM/Mailing/BAO/TrackableURL.php
api/v3/Mailing.php
api/v3/MailingGroup.php
sql/civicrm_generated.mysql
tests/phpunit/CiviTest/CiviUnitTestCase.php
xml/templates/civicrm_data.tpl