From: kurund <kurund@civicrm.org>
Date: Mon, 17 Nov 2014 04:13:06 +0000 (+0530)
Subject: Merge branch 'CRM-15474' of github.com:colemanw/civicrm-core into CRM-15527
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=e612dc821894de0df124892584a5f52d44f5297a;p=civicrm-core.git

Merge branch 'CRM-15474' of github.com:colemanw/civicrm-core into CRM-15527

Conflicts:
	templates/CRM/Event/Form/Participant.tpl

----------------------------------------
* CRM-15474: Event cart option js breaks "add participant" form
  https://issues.civicrm.org/jira/browse/CRM-15474
* CRM-15527: error in IPN relating to numRelatedMemberships
  https://issues.civicrm.org/jira/browse/CRM-15527
---

e612dc821894de0df124892584a5f52d44f5297a