From: Evan Prodromou Date: Wed, 20 Jan 2010 20:51:55 +0000 (-0500) Subject: Merge branch 'master' of git@gitorious.org:statusnet/mainline X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=2a3cb86e29e7b0d43c4a6f22dc84462c9e6227a0;p=quix0rs-gnu-social.git Merge branch 'master' of git@gitorious.org:statusnet/mainline --- 2a3cb86e29e7b0d43c4a6f22dc84462c9e6227a0