Merge pull request #4272 from eileenmcnaughton/CRM-15296-complete
authorDave Greenberg <dave@civicrm.org>
Tue, 7 Oct 2014 22:07:31 +0000 (15:07 -0700)
committerDave Greenberg <dave@civicrm.org>
Tue, 7 Oct 2014 22:07:31 +0000 (15:07 -0700)
CRM-15296 fix membership processing to complete if trxn_id isset

1  2 
CRM/Contribute/BAO/Contribution.php
CRM/Contribute/Form/Contribution/Confirm.php

Simple merge