merge to tip of tree

master
Dan Williams 18 years ago
parent d8dd8f8a65
commit dce4a8c13c

@ -14,7 +14,7 @@ import os
import pwd
import socket
from sugar import activity
import activity
import presence
import BuddyList

Loading…
Cancel
Save