Merge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-05-01-14-11-47
authorKurund Jalmi <kurund@civicrm.org>
Wed, 1 May 2013 21:15:48 +0000 (14:15 -0700)
committerKurund Jalmi <kurund@civicrm.org>
Wed, 1 May 2013 21:15:48 +0000 (14:15 -0700)
commit3ad735b477e8ef80caf5b68954eb678ac474c974
treeeacc3b4d257913f789f79a14fdfad4f9641672d8
parent0569e57797ccec8c931e6aa1e54a250b8a5f6bcf
parent9789ffc061e0e944483c9cd02e596a7ecec8ccd4
Merge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-05-01-14-11-47

Conflicts:
CRM/Core/BAO/ActionSchedule.php
CRM/Mailing/BAO/Mailing.php
CRM/Core/BAO/ActionSchedule.php
CRM/Mailing/BAO/Job.php
CRM/Mailing/BAO/Mailing.php
templates/CRM/Contact/Form/NewContact.tpl