projects / quix0rs-gnu-social.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c892726 4a139d1)
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
authorZach Copley <zach@status.net>
Wed, 17 Feb 2010 00:23:57 +0000 (16:23 -0800)
committerZach Copley <zach@status.net>
Wed, 17 Feb 2010 00:23:57 +0000 (16:23 -0800)
* 'testing' of gitorious.org:statusnet/mainline:
  OStatus: migrated notice parsing to use Activity helper classes; on the way to killing FeedMunger


Trivial merge
This is my personal clone from the wonderful software GNUSocial. I may fix or break things here, so use it on your own risk. :-)