Merge branch 'locshunt2' into 0.9.x

Conflicts: classes/User_location_prefs.php
2009-12-30 08:57:39 -10:00 · 2009-12-30 08:57:39 -10:00 · ad8ea98cd7
parent a1b130541b 544e884d30
commit ad8ea98cd7
1 changed files with 5 additions and 0 deletions
--- a/classes/User_location_prefs.php
+++ b/classes/User_location_prefs.php
@ -45,4 +45,9 @@ class User_location_prefs extends Memcached_DataObject

    /* the code above is auto generated do not remove the tag below */
    ###END_AUTOCODE
+
+    function sequenceKey()
+    {
+        return array(false, false, false);
+    }
 }