Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2013-10-28-15-02-34
authorkurund <kurund@civicrm.org>
Mon, 28 Oct 2013 09:38:27 +0000 (15:08 +0530)
committerkurund <kurund@civicrm.org>
Mon, 28 Oct 2013 09:38:27 +0000 (15:08 +0530)
commitc51d1602bae3a268cf2152e053914d2e78fbfa53
tree24aea6ff7445bd4cdc98bf3f991bcf3e456fb79d
parentc712044704ea36db60d901add82c1c2fb1324076
parent52df19870805bf5a2bae2388a1f6c5a0309c2d92
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2013-10-28-15-02-34

Conflicts:
CRM/Admin/Form/ScheduleReminders.php
sql/civicrm_generated.mysql
xml/version.xml
CRM/Batch/BAO/Batch.php
CRM/Case/BAO/Case.php
CRM/Contact/BAO/Relationship.php
CRM/Contact/Form/Contact.php
CRM/Core/BAO/UFGroup.php
CRM/Event/Page/ManageEvent.php
CRM/Mailing/BAO/Mailing.php
xml/templates/civicrm_data.tpl