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