Dan Williams 121179e344 Revert badly merged bit

2006-05-05 16:11:28 -04:00

..

bubble.png

…

bubbleOutline.png

…

BuddyList.py

…

chat.py

…

Makefile.am

…

network.py

3rd try on server traceback printing

2006-05-05 15:53:16 -04:00

p2p.py

Revert badly merged bit

2006-05-05 16:11:28 -04:00

presence.py

…

richtext.py

…