Merge branch 'master' of gitorious.org:statusnet/mainline into testing

author Brion Vibber <brion@pobox.com>

Thu, 27 May 2010 21:54:43 +0000 (14:54 -0700)

committer Brion Vibber <brion@pobox.com>

Thu, 27 May 2010 21:54:43 +0000 (14:54 -0700)
author Brion Vibber <brion@pobox.com>
Thu, 27 May 2010 21:54:43 +0000 (14:54 -0700)
committer Brion Vibber <brion@pobox.com>
Thu, 27 May 2010 21:54:43 +0000 (14:54 -0700)
diff --cc plugins/OpenID/finishaddopenid.php
Simple merge
diff --cc plugins/OpenID/finishopenidlogin.php
Simple merge
diff --cc plugins/OpenID/openid.php
Simple merge
author	Brion Vibber <brion@pobox.com>
	Thu, 27 May 2010 21:54:43 +0000 (14:54 -0700)
committer	Brion Vibber <brion@pobox.com>
	Thu, 27 May 2010 21:54:43 +0000 (14:54 -0700)
		1	2
plugins/OpenID/finishaddopenid.php	patch \|	diff1 \|	diff2 \|	blob \| history
plugins/OpenID/finishopenidlogin.php	patch \|	diff1 \|	diff2 \|	blob \| history
plugins/OpenID/openid.php	patch \|	diff1 \|	diff2 \|	blob \| history