Brion Vibber 3c4ead4996 Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x ... Conflicts: db/08to09.sql locale/statusnet.po scripts/update_po_templates.php		2010-03-01 14:59:26 -08:00
..
TwitterBridge.po	Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x	2010-03-01 14:59:26 -08:00