From: Brion Vibber Date: Wed, 3 Mar 2010 17:53:38 +0000 (-0800) Subject: Merge branch 'testing' of git@gitorious.org:statusnet/mainline X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=7313cd909479f771e960466d9194783c9a3158bb;p=quix0rs-gnu-social.git Merge branch 'testing' of git@gitorious.org:statusnet/mainline Conflicts: plugins/OStatus/OStatusPlugin.php --- 7313cd909479f771e960466d9194783c9a3158bb