Merge branch 'CRM-13964' of git://github.com/pratik-joshi/civicrm-core into CRM-13964
authorkurund <kurund@civicrm.org>
Tue, 21 Jan 2014 02:10:59 +0000 (18:10 -0800)
committerkurund <kurund@civicrm.org>
Tue, 21 Jan 2014 02:10:59 +0000 (18:10 -0800)
commit5ce9cbe9a0c840c5c1ded64b85235e2430af211b
tree13ad07e0d1665ce063d3c6d13a7ec5b7863fb91e
parent850eea21ab242c75f36519fbc3c25f29c0d8c806
parentb17ee3eee6a3b28c343db42c65a44c8a507ffa6c
Merge branch 'CRM-13964' of git://github.com/pratik-joshi/civicrm-core into CRM-13964

Conflicts:
CRM/Upgrade/Incremental/sql/4.5.alpha1.mysql.tpl
sql/civicrm_generated.mysql

----------------------------------------
* CRM-13964: New Event Registration with partial payment
  http://issues.civicrm.org/jira/browse/CRM-13964
CRM/Contribute/BAO/Contribution.php
CRM/Upgrade/Incremental/sql/4.5.alpha1.mysql.tpl
sql/civicrm_generated.mysql
xml/templates/civicrm_data.tpl