From: Evan Prodromou Date: Mon, 3 Oct 2011 13:14:17 +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=2930484d4f2a7b33a17ddd755499d270fe699329;p=quix0rs-gnu-social.git Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x --- 2930484d4f2a7b33a17ddd755499d270fe699329