Merge pull request #3063 from eileenmcnaughton/rebase
authorcolemanw <coleman@civicrm.org>
Thu, 1 May 2014 03:36:17 +0000 (20:36 -0700)
committercolemanw <coleman@civicrm.org>
Thu, 1 May 2014 03:36:17 +0000 (20:36 -0700)
CRM-14581 upgrade Multisite form including stdise group api

1  2 
CRM/Activity/BAO/Activity.php
CRM/Contact/BAO/Relationship.php
api/v3/Case.php
api/v3/utils.php

Simple merge
Simple merge
diff --cc api/v3/Case.php
Simple merge
Simple merge