From f21bc2416d672999b80f07387208e1b4a3d1c33b Mon Sep 17 00:00:00 2001
From: Aleksey Lim <alsroot@sugarlabs.org>
Date: Thu, 12 Apr 2012 05:35:29 +0000
Subject: Merge branch 'master' of git.sugarlabs.org:chat/mainline

---
(limited to 'activity')

--
cgit v0.9.1