James Walker 7c8031dc4b Merge remote branch 'statusnet/testing' into testing
Conflicts:
	plugins/OStatus/lib/webfinger.php
2010-02-25 23:49:45 -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