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

Conflicts:
	classes/Profile.php

diff --git a/classes/Profile.php b/classes/Profile.php
index c23fc1fed2083add4d9dc2cc09e4b74ff13b6f50..b9c50905a79e6dd06a3b35d01f6f7e660204d7ff 100644 (file)
--- 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();