From: Zach Copley <zach@status.net>
Date: Fri, 19 Mar 2010 17:08:47 +0000 (-0700)
Subject: Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=fb50a2d83c9a530479874d51f203ad8b3d4c9a7a;p=quix0rs-gnu-social.git

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

* 'testing' of gitorious.org:statusnet/mainline:
  Parse RSS items as activities
  Remove hkit and do our own hcard parsing
  Work around weird bug with HTML normalization via PHP DOM module; if source had xmlns and xml:lang I ended up with double output, breaking the subsequent parsing. Will have to track this down later and report upstream if not already resolved.
---

fb50a2d83c9a530479874d51f203ad8b3d4c9a7a