From daa3c75494f6ff5bd873b50d9af4e31fc5de77d5 Mon Sep 17 00:00:00 2001
From: Aleksey Lim <alsroot@member.fsf.org>
Date: Sun, 23 Jan 2011 12:44:32 +0000
Subject: Merge branch 'master' of git.sugarlabs.org:chat/mainline

---
(limited to 'activity.py')

--
cgit v0.9.1