Evan Prodromou 5565216b42 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
Conflicts:
	plugins/OStatus/OStatusPlugin.php
2010-02-20 20:27:04 -05:00
..
2010-01-08 00:38:20 -08:00
2010-01-08 00:38:20 -08:00
2009-11-12 10:24:18 +00:00
2010-01-07 17:37:44 -08:00