From: Brion Vibber Date: Tue, 4 Jan 2011 20:14:08 +0000 (-0800) Subject: Merge branch 'master' of gitorious.org:statusnet/mainline into 0.9.x X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=6e894c010fc0e7ddaaafa8795634d6343019aafb;p=quix0rs-gnu-social.git Merge branch 'master' of gitorious.org:statusnet/mainline into 0.9.x --- 6e894c010fc0e7ddaaafa8795634d6343019aafb