Marco Pesenti Gritti c234b7b4a3 Merge branch 'master' of git+ssh://crank.laptop.org/git/sugar ... Conflicts: sugar/presence/Buddy.py		2006-06-22 16:01:14 -04:00
..
__init__.py
Buddy.py	Merge branch 'master' of git+ssh://crank.laptop.org/git/sugar	2006-06-22 16:01:14 -04:00
Makefile.am
PresenceService.py	Merge branch 'master' of git+ssh://crank.laptop.org/git/sugar	2006-06-22 16:01:14 -04:00
Service.py