From 86e2111461fab98d8c188d50ec8bd0c72c527f73 Mon Sep 17 00:00:00 2001
From: Pootle daemon <pootle@pootle.sugarlabs.org>
Date: Mon, 13 Jun 2011 14:23:40 +0000
Subject: Merge branch 'master' of git.sugarlabs.org:turtleart/mainline

---
(limited to 'collaboration/telepathyclient.py')

diff --git a/collaboration/telepathyclient.py b/collaboration/telepathyclient.py
index 5491530..e00f053 100644
--- a/collaboration/telepathyclient.py
+++ b/collaboration/telepathyclient.py
@@ -18,10 +18,11 @@ import logging
 
 import dbus
 from dbus import PROPERTIES_IFACE
+
 from telepathy.interfaces import CLIENT, \
-                                 CLIENT_APPROVER, \
-                                 CLIENT_HANDLER, \
-                                 CLIENT_INTERFACE_REQUESTS
+    CLIENT_APPROVER, \
+    CLIENT_HANDLER, \
+    CLIENT_INTERFACE_REQUESTS
 from telepathy.server import DBusProperties
 
 import dispatch
@@ -34,6 +35,7 @@ _instance = None
 
 
 class TelepathyClient(dbus.service.Object, DBusProperties):
+
     def __init__(self):
         self._interfaces = set([CLIENT, CLIENT_HANDLER,
                                 CLIENT_INTERFACE_REQUESTS, PROPERTIES_IFACE,
--
cgit v0.9.1