Merge remote-tracking branch 'origin/master' into master-master-civimail-abtest-2014...
authorTim Otten <totten@civicrm.org>
Fri, 21 Nov 2014 01:00:35 +0000 (17:00 -0800)
committerTim Otten <totten@civicrm.org>
Fri, 21 Nov 2014 01:00:35 +0000 (17:00 -0800)
commit64c2aeba7eea943c799caafed1c82e4f383a1e2d
tree076d5c21d8d256bcf868d35f74f822f4c7f9843d
parent4eeab98aa76b95b35bc71c9895d2d9245a4009c6
parenteb526a0102ac5ac471394833875f3e65b601b699
Merge remote-tracking branch 'origin/master' into master-master-civimail-abtest-2014-11-20-16-58-49

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