Brion Vibber 7005ef6661 Merge branch 'testing' into 0.9.x ... Conflicts: plugins/OpenID/openidlogin.php		2010-05-19 12:51:25 -07:00
..
statusnet.po	Merge branch 'testing' into 0.9.x	2010-05-19 12:51:25 -07:00