Merge branch '0.9.x' into 1.0.x

Conflicts:
	lib/queuemanager.php

1 files changed, 3 insertions, 3 deletions

diff --git a/lib/queuemanager.php b/lib/queuemanager.php
index a0b13fe55..162c9f375 100644
--- a/lib/queuemanager.php
+++ b/lib/queuemanager.php
@@ -157,17 +157,17 @@ abstract class QueueManager extends IoManager
     /**
      * Encode an object for queued storage.
      *
-     * @param mixed $object
+     * @param mixed $item
      * @return string
      */
-    protected function encode($object)
+    protected function encode($item)
     {
         return serialize($object);
     }
 
     /**
      * Decode an object from queued storage.
-     * Accepts back-compat notice reference entries and strings for now.
+     * Accepts notice reference entries and serialized items.
      *
      * @param string
      * @return mixed