From: Brion Vibber Date: Fri, 19 Mar 2010 22:51:22 +0000 (-0700) Subject: Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=7e2af3dcae956c7490df74be8d94fa09a4bab673;p=quix0rs-gnu-social.git Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x Conflicts: plugins/OStatus/extlib/hkit/hkit.class.php plugins/OStatus/lib/discoveryhints.php --- 7e2af3dcae956c7490df74be8d94fa09a4bab673