From: Evan Prodromou Date: Mon, 2 May 2011 00:25:59 +0000 (-0700) 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=b906fe75b698eb4d0cac1659b8992544f4c7e4db;p=quix0rs-gnu-social.git Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x --- b906fe75b698eb4d0cac1659b8992544f4c7e4db