3 Commits

Author	SHA1	Message	Date
James Walker	d1256b547f	bad merge.. cleaning up missing webfinger bits	2010-02-26 03:43:35 -05:00
James Walker	7c8031dc4b	Merge remote branch 'statusnet/testing' into testing ... Conflicts: plugins/OStatus/lib/webfinger.php	2010-02-25 23:49:45 -05:00
James Walker	93f4f07c12	moving webfinger action to xrdaction	2010-02-25 17:52:18 -05:00