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

Conflicts: classes/Profile.php
2011-04-14 18:28:03 -04:00 · 2011-04-14 18:28:03 -04:00 · 41dc9ca497
parent 3df69fe5ba 70c8de4354
commit 41dc9ca497
1 changed files with 1 additions and 1 deletions
--- a/classes/Profile.php
+++ b/classes/Profile.php
@ -1324,7 +1324,7 @@ class Profile extends Memcached_DataObject
        return $profile;
    }

-    function getLists($showPrivate)
+    function getLists()
    {
        $ids = array();