From: Ian Denhardt Date: Mon, 9 Aug 2010 18:43:32 +0000 (-0400) Subject: Merge branch 'master' of git://gitorious.org/statusnet/mainline X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=d933ee7bad47aeb3267dd9c23633d3943478cfe1;p=quix0rs-gnu-social.git Merge branch 'master' of git://gitorious.org/statusnet/mainline --- d933ee7bad47aeb3267dd9c23633d3943478cfe1