From: Zach Copley <zach@status.net>
Date: Sat, 17 Sep 2011 21:39:26 +0000 (-0700)
Subject: Merge branch 'master' of gitorious.org:statusnet/mainline
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=985f52ce6097816f2fd9fc07bf2c051e59db4750;p=quix0rs-gnu-social.git

Merge branch 'master' of gitorious.org:statusnet/mainline

* 'master' of gitorious.org:statusnet/mainline:
  problem with remote subscription on groups in OStatus
  show correct favorites link
---

985f52ce6097816f2fd9fc07bf2c051e59db4750