From: Evan Prodromou Date: Thu, 22 Sep 2011 20:31:26 +0000 (-0400) Subject: Merge branch 'master' of gitorious.org:statusnet/mainline X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=e3460d9b24eca433c7a009562d78c9aec1b99a5c;p=quix0rs-gnu-social.git Merge branch 'master' of gitorious.org:statusnet/mainline --- e3460d9b24eca433c7a009562d78c9aec1b99a5c