From: Evan Prodromou Date: Mon, 3 May 2010 18:54:54 +0000 (-0400) Subject: Merge branch 'master' of gitorious.org:statusnet/mainline X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=8a2144aeed2e338ef1b21425b9387086790aa820;p=quix0rs-gnu-social.git Merge branch 'master' of gitorious.org:statusnet/mainline --- 8a2144aeed2e338ef1b21425b9387086790aa820