From: Zach Copley Date: Thu, 14 Apr 2011 22:29:11 +0000 (+0000) Subject: Merge branch '1.0.x' of git@gitorious.org:statusnet/mainline into 1.0.x X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=bef1ed75b5e0bf11d824eabc2d2ac79ffbec9fcf;p=quix0rs-gnu-social.git Merge branch '1.0.x' of git@gitorious.org:statusnet/mainline into 1.0.x --- bef1ed75b5e0bf11d824eabc2d2ac79ffbec9fcf