From: Zach Copley <zach@status.net>
Date: Thu, 25 Feb 2010 21:40:14 +0000 (-0800)
Subject: Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=bac959ad46e6e04bce8c29f8a24e198e62bf5616;p=quix0rs-gnu-social.git

Merge branch 'testing' of gitorious.org:statusnet/mainline into testing

* 'testing' of gitorious.org:statusnet/mainline:
  Not sure how this ended up in wrong-cased dir...
  OStatus: fix remote groups to work with new user_groups/local_groups split.

Conflicts:
	classes/User_group.php
---

bac959ad46e6e04bce8c29f8a24e198e62bf5616