From: Brion Vibber Date: Fri, 12 Nov 2010 21:32:48 +0000 (-0800) Subject: Merge branch 'master' of gitorious.org:statusnet/mainline into 0.9.x X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=65eeb7cba530e45b8d8a25644505619e8af63971;hp=-c;p=quix0rs-gnu-social.git Merge branch 'master' of gitorious.org:statusnet/mainline into 0.9.x Conflicts: actions/newgroup.php --- 65eeb7cba530e45b8d8a25644505619e8af63971