From: Brion Vibber Date: Wed, 16 Mar 2011 18:12:29 +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=d1c778b4396b778c2124852cc9856f169109e551;p=quix0rs-gnu-social.git Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x --- d1c778b4396b778c2124852cc9856f169109e551