Merge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-05-01-11-04-54
authorKurund Jalmi <kurund@civicrm.org>
Wed, 1 May 2013 18:12:10 +0000 (11:12 -0700)
committerKurund Jalmi <kurund@civicrm.org>
Wed, 1 May 2013 18:12:10 +0000 (11:12 -0700)
commitf8c0096cdf4c70962010a7686412070b3417fe4d
tree8dee819059f7af2112eb24f23fde1dc482be15ce
parent260c27768c81b8c3360bda47992c84841eed7b2d
parent94320a12126db7940c8fe371e0693dbba24a60b8
Merge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-05-01-11-04-54

Conflicts:
sql/civicrm_generated.mysql
CRM/Activity/BAO/Activity.php
CRM/Contact/BAO/Query.php
CRM/Contact/Form/Task/SMSCommon.php
CRM/Mailing/BAO/Job.php
CRM/Mailing/BAO/Mailing.php
sql/civicrm_generated.mysql
templates/CRM/Contact/Form/NewContact.tpl
tests/phpunit/CRM/Core/BAO/ActionScheduleTest.php
xml/templates/civicrm_data.tpl