Merge branch 'master' of git+ssh://dcbw@crank.laptop.org/git/sugar

2006-06-16 15:25:25 -04:00
parent c46d300c18 29a730e0a4
commit 38565321d5
4 changed files with 47 additions and 17 deletions
@@ -9,7 +9,6 @@ from sugar.p2p import network

 PRESENCE_SERVICE_TYPE = "_presence_olpc._tcp"

-
 class Buddy(gobject.GObject):
 	"""Represents another person on the network and keeps track of the
 	activities and resources they make available for sharing."""