From: Brion Vibber Date: Tue, 18 May 2010 20:21:23 +0000 (-0700) Subject: Merge branch 'master' of gitorious.org:statusnet/mainline into testing X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=d5b4df4097c2d64e52f249042038ddbf99769b6c;p=quix0rs-gnu-social.git Merge branch 'master' of gitorious.org:statusnet/mainline into testing --- d5b4df4097c2d64e52f249042038ddbf99769b6c