From: Brion Vibber Date: Sat, 26 Jun 2010 14:17:36 +0000 (-0400) Subject: Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=696e4ba393c658d5b2e1fe46e1389bd7b2cfdb34;p=quix0rs-gnu-social.git Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x Conflicts: plugins/OpenID/openidserver.php (cleaned up mismatched comment) --- 696e4ba393c658d5b2e1fe46e1389bd7b2cfdb34