From: Zach Copley Date: Wed, 16 Mar 2011 21:53:20 +0000 (-0700) 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=2d88e6d07ee8fa03891a27b5eaeb53ca3bc58909;p=quix0rs-gnu-social.git Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x --- 2d88e6d07ee8fa03891a27b5eaeb53ca3bc58909