From: Evan Prodromou Date: Fri, 19 Mar 2010 01:57:38 +0000 (-0500) Subject: Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=ac609e804078cf70fcc02b36aa1eb40115354715;p=quix0rs-gnu-social.git Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing Conflicts: plugins/OStatus/extlib/hkit/hkit.class.php plugins/OStatus/lib/discoveryhints.php --- ac609e804078cf70fcc02b36aa1eb40115354715