Merge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-05-28-14-04-12
authorKurund Jalmi <kurund@civicrm.org>
Tue, 28 May 2013 08:44:26 +0000 (14:14 +0530)
committerKurund Jalmi <kurund@civicrm.org>
Tue, 28 May 2013 08:44:26 +0000 (14:14 +0530)
commitc1c4f1e167414705fbceb41881d8f5cf91ca2d63
tree23fcb41b399d1d48c4324fe3a8ba4833918c78f9
parent1c0f1b28a78453078dc0b6ddc6bee27323aa5ecc
parent3296563d223e68e156ebd830dd89beb80fae853c
Merge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-05-28-14-04-12

Conflicts:
CRM/Upgrade/Incremental/sql/4.2.3.mysql.tpl
CRM/Upgrade/Incremental/sql/4.2.alpha1.mysql.tpl
sql/civicrm_generated.mysql
13 files changed:
CRM/Event/Form/ManageEvent/ScheduleReminders.php
CRM/Member/Form/Search.php
CRM/Pledge/Form/Search.php
CRM/Upgrade/Incremental/sql/4.1.alpha1.mysql.tpl
CRM/Upgrade/Incremental/sql/4.2.3.mysql.tpl
CRM/Upgrade/Incremental/sql/4.2.alpha1.mysql.tpl
CRM/Upgrade/Incremental/sql/4.3.alpha1.mysql.tpl
CRM/Upgrade/Incremental/sql/4.3.alpha2.mysql.tpl
sql/civicrm_generated.mysql
templates/CRM/Admin/Form/ScheduleReminders.tpl
templates/CRM/Contact/Form/Relationship.tpl
templates/CRM/Event/Form/ManageEvent/ScheduleReminders.tpl
xml/templates/civicrm_data.tpl