Merge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-04-23-15-17-29
authorTim Otten <totten@civicrm.org>
Tue, 23 Apr 2013 22:20:45 +0000 (15:20 -0700)
committerTim Otten <totten@civicrm.org>
Tue, 23 Apr 2013 22:20:45 +0000 (15:20 -0700)
commitde1298369755f3e22e6d603e49def94578f18384
treeec191a999648eb46523b7eeb811586d059d70a2a
parenta980b742708f332873729d807213b1747a750213
parent6fbb10563c287483a0280abb2caf0dc98c4a617d
Merge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-04-23-15-17-29

Conflicts:
CRM/Core/BAO/ActionSchedule.php
sql/civicrm_generated.mysql
xml/version.xml
CRM/Activity/BAO/Activity.php
CRM/Campaign/BAO/Query.php
CRM/Case/XMLProcessor/Report.php
CRM/Contact/BAO/Query.php
CRM/Contact/Form/Task/SMSCommon.php
CRM/Core/BAO/ActionSchedule.php
CRM/Mailing/BAO/Job.php
css/civicrm.css
templates/CRM/Activity/Form/Activity.tpl