From: Evan Prodromou Date: Fri, 30 Sep 2011 18:25:06 +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=4af466f1a609d2ef503bbc70d9efdcadda1d91f9;p=quix0rs-gnu-social.git Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x --- 4af466f1a609d2ef503bbc70d9efdcadda1d91f9