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