From: Evan Prodromou Date: Wed, 11 Aug 2010 06:36:13 +0000 (-0700) Subject: Merge branch 'master' of gitorious.org:statusnet/mainline X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=41dfea163460bb216483e8e12fff7a8afefbb4fb;p=quix0rs-gnu-social.git Merge branch 'master' of gitorious.org:statusnet/mainline --- 41dfea163460bb216483e8e12fff7a8afefbb4fb