From: Evan Prodromou Date: Fri, 15 Apr 2011 03:58:02 +0000 (-0400) Subject: Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=8df3fcd19f6f6c3ac3a3ce9a316ab719e6c41726;p=quix0rs-gnu-social.git Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x --- 8df3fcd19f6f6c3ac3a3ce9a316ab719e6c41726