From: Evan Prodromou Date: Fri, 2 Dec 2011 20:48:43 +0000 (-0500) Subject: Merge branch 'master' of gitorious.org:statusnet/mainline X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=821904230ddc971feb23eccdf06c41be4568958c;p=quix0rs-gnu-social.git Merge branch 'master' of gitorious.org:statusnet/mainline --- 821904230ddc971feb23eccdf06c41be4568958c