Merge branch 'CRM-13965' of git://github.com/pratik-joshi/civicrm-core into CRM-13965
authorkurund <kurund@civicrm.org>
Tue, 28 Jan 2014 04:11:12 +0000 (23:11 -0500)
committerkurund <kurund@civicrm.org>
Tue, 28 Jan 2014 04:11:12 +0000 (23:11 -0500)
commitc20a2a076238cc98b963d877e8ec5adc6f0d0fe6
treef431b84a32e53b0cf5f8f879ce5f362e28b2bc0b
parent6a00ff0d395476086d4c4b4fe3ba48672280dd1a
parent73b85decba5e5719013aa512df1b117b2ab08f7b
Merge branch 'CRM-13965' of git://github.com/pratik-joshi/civicrm-core into CRM-13965

Conflicts:
CRM/Upgrade/4.5.alpha1.msg_template/civicrm_msg_template.tpl

----------------------------------------
* CRM-13965: Record additional payments or refunds for pending-pay later OR partially paid event registrations
  http://issues.civicrm.org/jira/browse/CRM-13965
CRM/Contribute/BAO/Contribution.php
CRM/Upgrade/4.5.alpha1.msg_template/civicrm_msg_template.tpl
CRM/Upgrade/Incremental/sql/4.5.alpha1.mysql.tpl