From: Evan Prodromou Date: Thu, 24 Mar 2011 02:11:13 +0000 (-0400) Subject: Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=483922f1c4e4851511e8735aae50c943e5552845;p=quix0rs-gnu-social.git Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x --- 483922f1c4e4851511e8735aae50c943e5552845