Merge branch '0.9.x' into 1.0.x

Conflicts:
	lib/queuemanager.php

diff --cc actions/showstream.php
Simple merge

diff --cc classes/User.php
Simple merge

diff --cc classes/statusnet.ini
Simple merge

diff --cc db/statusnet.sql
Simple merge

diff --cc lib/queuemanager.php
index a0b13fe556f6a93596c91580084ab9352080d1dc,64bb52e106ee7289bf03934ebb32b145f33315d5..162c9f3757d422aa95e07c37c32688fe5edc1386
--- 1/lib/queuemanager.php
--- 2/lib/queuemanager.php
+++ b/lib/queuemanager.php
@@@ -155,14 -155,21 +155,14 @@@ abstract class QueueManager extends IoM
      }
  
      /**
 -     * Encode an object or variable for queued storage.
 -     * Notice objects are currently stored as an id reference;
 -     * other items are serialized.
 +     * Encode an object for queued storage.
       *
-      * @param mixed $object
+      * @param mixed $item
       * @return string
       */
-     protected function encode($object)
+     protected function encode($item)
      {
 -        if ($item instanceof Notice) {
 -            // Backwards compat
 -            return $item->id;
 -        } else {
 -            return serialize($item);
 -        }
 +        return serialize($object);
      }
  
      /**

diff --cc lib/statusnet.php
Simple merge

diff --cc lib/util.php
Simple merge