From: Evan Prodromou Date: Sun, 2 May 2010 21:20:06 +0000 (-0400) Subject: Merge branch 'master' of gitorious.org:statusnet/mainline X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=ac424d943e90159ef253a9df672b456dcd1d9045;p=quix0rs-gnu-social.git Merge branch 'master' of gitorious.org:statusnet/mainline --- ac424d943e90159ef253a9df672b456dcd1d9045