Commit Graph

2 Commits

Author SHA1 Message Date
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
Brion Vibber
2f77d47fd4 Build stub .po template for Gravatar plugin 2009-12-11 16:28:51 -08:00