From: Evan Prodromou Date: Fri, 8 Apr 2011 21:09:15 +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=8cb0d7e708cfe81f3161c7238f7c873efb1c38a4;p=quix0rs-gnu-social.git Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x --- 8cb0d7e708cfe81f3161c7238f7c873efb1c38a4