From: Evan Prodromou <evan@status.net>
Date: Tue, 5 Jan 2010 08:50:04 +0000 (-1000)
Subject: Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=4e84c523b7911b8b6cb6113b9c91cbfdc47f027d;p=quix0rs-gnu-social.git

Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

Conflicts:
	classes/Memcached_DataObject.php
---

4e84c523b7911b8b6cb6113b9c91cbfdc47f027d
diff --cc classes/Memcached_DataObject.php
index a3a69e6672,d830884b67..aab1cace6d
--- a/classes/Memcached_DataObject.php
+++ b/classes/Memcached_DataObject.php
@@@ -66,7 -66,7 +66,6 @@@ class Memcached_DataObject extends DB_D
          // Clear this out so we don't accidentally break global
          // state in *this* process.
          $this->_DB_resultid = null;
- 
 -        
          // We don't have any local DBO refs, so clear these out.
          $this->_link_loaded = false;
      }