From: Evan Prodromou Date: Sun, 10 Jan 2010 19:15:45 +0000 (-0800) Subject: Merge branch 'master' of git@gitorious.org:statusnet/mainline X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=91760ae2ae677c68fa818e98e35525f07ded3fd8;p=quix0rs-gnu-social.git Merge branch 'master' of git@gitorious.org:statusnet/mainline --- 91760ae2ae677c68fa818e98e35525f07ded3fd8