From: Evan Prodromou Date: Sat, 16 Jan 2010 15:48:59 +0000 (-0800) Subject: Merge branch 'master' of git@gitorious.org:statusnet/mainline X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=21c3e08804b312aaea21ae6bd0a0691304d6e4cd;p=quix0rs-gnu-social.git Merge branch 'master' of git@gitorious.org:statusnet/mainline --- 21c3e08804b312aaea21ae6bd0a0691304d6e4cd