Evan Prodromou ac609e8040 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
Conflicts:
	plugins/OStatus/extlib/hkit/hkit.class.php
	plugins/OStatus/lib/discoveryhints.php
2010-03-18 20:57:38 -05:00
..
2010-03-02 23:25:34 -05:00
2010-03-09 21:26:48 -05:00
2009-11-12 10:24:18 +00:00
2010-03-12 10:07:32 -08:00
2010-03-04 23:30:36 -05:00