From: Brion Vibber Date: Wed, 2 Mar 2011 00:18:24 +0000 (-0800) 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=4f41af71794b93c9cb5c313a25beab0a4d4d081e;hp=-c;p=quix0rs-gnu-social.git Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x --- 4f41af71794b93c9cb5c313a25beab0a4d4d081e