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
..
locale	Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x	2010-03-01 14:59:26 -08:00
SamplePlugin.php	add version info to SamplePlugin	2010-01-07 17:37:44 -08:00
User_greeting_count.php	add keyTypes() for User_greeting_count	2010-01-03 11:27:09 -10:00
hello.php	Fix update_po_templates.php to support the plural and context variants of _m() in plugins	2010-02-24 16:34:45 -08:00