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-02-21 14:28:06 -08:00
2010-03-18 17:08:19 -07:00
2010-03-15 15:17:31 -04:00