From: Evan Prodromou Date: Fri, 1 Jan 2010 21:27:28 +0000 (-1000) Subject: Merge branch 'master' of git@gitorious.org:statusnet/mainline X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=d2bbf65f1915e259343b32934fa50cd693dbda26;p=quix0rs-gnu-social.git Merge branch 'master' of git@gitorious.org:statusnet/mainline --- d2bbf65f1915e259343b32934fa50cd693dbda26