From: kurund <kurund@civicrm.org>
Date: Mon, 18 May 2015 19:51:14 +0000 (+0530)
Subject: Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-05-19-00-08-12
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=9df7064ff60153a9bce0bc91e0b5de707bb031e7;p=civicrm-core.git

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
---

9df7064ff60153a9bce0bc91e0b5de707bb031e7