From: Evan Prodromou Date: Mon, 26 Apr 2010 06:43:33 +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=5c05cd2b1a93d360bde7cb7dfc9ba39e5a5a7624;p=quix0rs-gnu-social.git Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x --- 5c05cd2b1a93d360bde7cb7dfc9ba39e5a5a7624