CRM-12463 fix test broken by soft credit restructure / make api stable
CRM-11320 fix error in test
opps removed too much debug :-(
CRM-7954 fix on prev, copy & paste error in new BAO for membershipBlock
CRM-12628 rename non-standard MailingGroup DAO instead of hack. Also add BAO for standardisation
Merge pull request #766 from eileenmcnaughton/test-fix

Test fixes (contribution soft credit, tweaks on previous fixes)
Merge pull request #767 from eileenmcnaughton/CRM-12628

CRM-12628 rename non-standard MailingGroup DAO instead of hack. Also add...
CRM-12613 - Forward port REST.php

This file had been held back from normal merge-forward due to
merge-conflicts.  Investigating upstream/master, it seems that there were
two changes that may have been source of conflict:

 * 2ede60ec - This is formatting change and a bad-commit of a debug code
 * c5f77b41 - This is a real functional change but was backported (and
   further fixed) in 4.3, so 4.3's version is better.

----------------------------------------
* CRM-12613: Resolve merge of REST.php (4.3=>master)
  http://issues.civicrm.org/jira/browse/CRM-12613
Merge pull request #773 from totten/merge-rest

CRM-12613 - Forward port REST.php
Update title and description of Contributions by Organization
Merge pull request #780 from hbergin/CRM-12644

Update title and description of Contributions by Organization
-- CRM-10397 Pay Later Improvements
-- CRM-10397 Updated Description of Pay Later Label
Merge pull request #784 from ravishnair/CRM-10397

CRM-10397 Pay Later Improvements