Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-05-19-00-08-12
authorkurund <kurund@civicrm.org>
Mon, 18 May 2015 19:51:14 +0000 (01:21 +0530)
committerkurund <kurund@civicrm.org>
Mon, 18 May 2015 19:51:14 +0000 (01:21 +0530)
commit9df7064ff60153a9bce0bc91e0b5de707bb031e7
treeac8fe824a9879c4c677c627988aefb717acaca29
parent235651477b27eea207be9939f0b8b7effa257497
parenta800e7288dfc05be825c026cea9c131a07f42717
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-05-19-00-08-12

Conflicts:
sql/civicrm_generated.mysql
templates/CRM/Member/Form/MembershipRenewal.tpl
15 files changed:
CRM/Batch/Form/Entry.php
CRM/Campaign/Form/Task/Interview.php
CRM/Contact/BAO/Relationship.php
CRM/Core/BAO/Navigation.php
CRM/Core/Payment.php
CRM/Core/ScheduledJob.php
CRM/Event/Form/Registration.php
CRM/Logging/Schema.php
CRM/Mailing/BAO/Mailing.php
CRM/Mailing/BAO/MailingJob.php
CRM/Price/BAO/PriceSet.php
CRM/Report/Form.php
templates/CRM/Activity/Form/Activity.tpl
templates/CRM/Member/Form/MembershipRenewal.tpl
xml/templates/civicrm_data.tpl