From: Evan Prodromou Date: Fri, 4 Mar 2011 21:31:58 +0000 (-0500) 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=8dbbee92e9f613d9f11bac712c2891b140d20b03;p=quix0rs-gnu-social.git Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x --- 8dbbee92e9f613d9f11bac712c2891b140d20b03