Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase

diff --cc classes/Notice.php
index 07fa373339b89e137d5b0a5bf3650e0c6129842e,a4f530c44facfe768ed9aec178a5a749d8249448..5a91e6f13a84c80021478795a0fa8b6c156f1a3d
--- 1/classes/Notice.php
--- 2/classes/Notice.php
+++ b/classes/Notice.php
@@@ -496,18 -537,10 +537,16 @@@ class Notice extends Memcached_DataObje
  
          // Note: groups may save tags, so must be run after tags are saved
          // to avoid errors on duplicates.
-         if (isset($groups)) {
-             $notice->saveKnownGroups($groups);
-         } else {
-             $notice->saveGroups();
-         }
+         // Note: groups should always be set.
+ 
+         $notice->saveKnownGroups($groups);
  
 +        if (isset($peopletags)) {
 +            $notice->saveProfileTags($peopletags);
 +        } else {
 +            $notice->saveProfileTags();
 +        }
 +
          if (isset($urls)) {
              $notice->saveKnownUrls($urls);
          } else {

diff --cc classes/statusnet.ini
Simple merge

diff --cc lib/apiaction.php
Simple merge

diff --cc theme/neo/css/display.css
Simple merge