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

Conflicts: classes/Memcached_DataObject.php
2010-01-04 22:50:04 -10:00
parent 0c31c3d80c 2960193cc4
commit 4e84c523b7
3 changed files with 118 additions and 61 deletions
--- a/classes/Memcached_DataObject.php
+++ b/classes/Memcached_DataObject.php
@@ -66,7 +66,6 @@ class Memcached_DataObject extends DB_DataObject
        // 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;
    }