From: Evan Prodromou Date: Thu, 14 Jan 2010 01:40:39 +0000 (-0800) Subject: Merge branch 'master' of git@gitorious.org:statusnet/mainline X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=fdb64eed2f1d24ad38fe4a6bc680e3592647c0a6;p=quix0rs-gnu-social.git Merge branch 'master' of git@gitorious.org:statusnet/mainline --- fdb64eed2f1d24ad38fe4a6bc680e3592647c0a6