From: Evan Prodromou Date: Wed, 3 Feb 2010 16:53:54 +0000 (-0500) Subject: Merge branch 'master' of git@gitorious.org:statusnet/mainline X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=20953ea3de18eb596984cb4105d3eee71494f2f1;hp=-c;p=quix0rs-gnu-social.git Merge branch 'master' of git@gitorious.org:statusnet/mainline --- 20953ea3de18eb596984cb4105d3eee71494f2f1