Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar

2007-05-28 17:10:54 +01:00
parent 706830c489 8915657a08
commit 5dacfdd365
22 changed files with 191 additions and 92 deletions
@@ -173,7 +173,7 @@ class TestPresenceService(PresenceService):
                         self.__test_num, self.__randomize)

    def internal_get_activity(self, actid):
-        return self._activities.get(actid, None):
+        return self._activities.get(actid, None)


 def _extract_public_key(keyfile):