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

* 'testing' of gitorious.org:statusnet/mainline:
  quick fix: skip notice from unused variable on group atom feed generation
  Avoid notice on local group creation when uri isn't passed in at create time (needs to be generated)

actions/apitimelinegroup.php

@@ -140,7 +140,7 @@ class ApiTimelineGroupAction extends ApiPrivateAuthAction
 
                 // @todo set all this Atom junk up inside the feed class
 
-                $atom->setId($id);
+                #$atom->setId($id);
                 $atom->setTitle($title);
                 $atom->setSubtitle($subtitle);
                 $atom->setLogo($logo);

classes/User_group.php

@@ -455,6 +455,11 @@ class User_group extends Memcached_DataObject
         $group = new User_group();
 
         $group->query('BEGIN');
+        
+        if (empty($uri)) {
+            // fill in later...
+            $uri = null;
+        }
 
         $group->nickname    = $nickname;
         $group->fullname    = $fullname;