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

* '1.0.x' of gitorious.org:statusnet/mainline:
  add conversation ID to notice output
  For fave count, don't use distinct
  Static -> static
  allow posting to groups through atompub

lib/apiaction.php

@@ -376,6 +376,7 @@ class ApiAction extends Action
         // StatusNet-specific
 
         $twitter_status['statusnet_html'] = $notice->rendered;
+        $twitter_status['statusnet_conversation_id'] = $notice->conversation;
 
         return $twitter_status;
     }