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
..
2010-02-25 22:30:04 -05:00
2010-01-13 17:28:31 -08:00
2010-01-10 14:04:18 +13:00