Merge branch '1.0.x' into limitdist2

diff --cc lib/conversationnoticestream.php
Simple merge

diff --cc lib/publicnoticestream.php
index 19d0ad96a0c783a1d124e2fd0483fbba178b6f4c,6a861ca26e68109921ca1acd4042a0c2602df88b..5c8d313d46591dd3650d80a6bd78352a9aceca48
--- 1/lib/publicnoticestream.php
--- 2/lib/publicnoticestream.php
+++ b/lib/publicnoticestream.php
@@@ -54,20 -8,9 +54,20 @@@ class PublicNoticeStream extends Scopin
      }
  }
  
 +/**
 + * Raw public stream
 + *
 + * @category  Stream
 + * @package   StatusNet
 + * @author    Evan Prodromou <evan@status.net>
 + * @copyright 2011 StatusNet, Inc.
 + * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
 + * @link      http://status.net/
 + */
 +
  class RawPublicNoticeStream extends NoticeStream
  {
-     function getNoticeIds($offset=0, $limit=20, $since_id=0, $max_id=0)
+     function getNoticeIds($offset, $limit, $since_id, $max_id)
      {
          $notice = new Notice();
  

diff --cc lib/replynoticestream.php
Simple merge