Merge branch 'master' of gitorious.org:statusnet/mainline
authorZach Copley <zach@status.net>
Sat, 17 Sep 2011 21:39:26 +0000 (14:39 -0700)
committerZach Copley <zach@status.net>
Sat, 17 Sep 2011 21:39:26 +0000 (14:39 -0700)
commit985f52ce6097816f2fd9fc07bf2c051e59db4750
tree556b2eed790a4af52eb51ce2f86d429674d7de62
parent4467615021fad00ab92df0a79a9a792cbcb7280e
parentf52d33753e1382b598763d617e762b328b6b4aff
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