From: Evan Prodromou Date: Thu, 28 Jan 2010 18:54:19 +0000 (-0500) Subject: Merge branch 'master' of git@gitorious.org:statusnet/mainline X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=d5f86f7a8a113991f050425e411287da4f738ca2;p=quix0rs-gnu-social.git Merge branch 'master' of git@gitorious.org:statusnet/mainline --- d5f86f7a8a113991f050425e411287da4f738ca2