From: Zach Copley <zach@status.net>
Date: Fri, 26 Feb 2010 02:13:34 +0000 (-0800)
Subject: Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=c49fbb63c56cc851153d0fecec81b4ca92b41bc6;p=quix0rs-gnu-social.git

Merge branch 'testing' of gitorious.org:statusnet/mainline into testing

* 'testing' of gitorious.org:statusnet/mainline:
  init_conversation.php script to copy old notice conversations into the conversation table
  cache results of webfinger lookups
  Parse an hcard for hints, if available
  use new hcard method for webfinger
  add hkit for hCard parsing
  use new dedicated hcard method for Webfinger profile
  Add an hcard action
---

c49fbb63c56cc851153d0fecec81b4ca92b41bc6