Merge branch 'master' of gitorious.org:statusnet/mainline
authorEvan Prodromou <evan@status.net>
Sat, 28 Jul 2012 17:59:40 +0000 (13:59 -0400)
committerEvan Prodromou <evan@status.net>
Sat, 28 Jul 2012 17:59:40 +0000 (13:59 -0400)
commit330041e8bfd91f0b9ba3f11a957a6b1be93c631e
tree6d58c7dede250f8a467cb1342c6b1fd539cbc4e3
parentd155936d98cf1e1511c3311c340c634c9c9cc2bb
parent3ad77e8bb2eaea62b440bccec95f1868fa32bf33
Merge branch 'master' of gitorious.org:statusnet/mainline
plugins/OStatus/actions/ostatusgroup.php