From: Evan Prodromou <evan@status.net>
Date: Fri, 15 Jul 2011 21:46:19 +0000 (-0400)
Subject: Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=98064e63365e7a38c3631dd9a4c04b122eae7cdd;p=quix0rs-gnu-social.git

Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
---

98064e63365e7a38c3631dd9a4c04b122eae7cdd
diff --cc classes/Notice.php
index e82b567e9c,6eb4d9001e..650dca051b
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@@ -84,14 -84,9 +84,14 @@@ class Notice extends Memcached_DataObje
      /* the code above is auto generated do not remove the tag below */
      ###END_AUTOCODE
  
 +	function multiGet($kc, $kvs, $skipNulls=true)
 +	{
 +		return Memcached_DataObject::multiGet('Notice', $kc, $kvs, $skipNulls);
 +	}
 +	
      /* Notice types */
      const LOCAL_PUBLIC    =  1;
-     const REMOTE_OMB      =  0;
+     const REMOTE          =  0;
      const LOCAL_NONPUBLIC = -1;
      const GATEWAY         = -2;