From 02ae08cc22be9dddf3ccb420cb6e3c8af1ce262c Mon Sep 17 00:00:00 2001
From: Aleksey Lim <alsroot@sugarlabs.org>
Date: Sat, 14 Apr 2012 06:18:17 +0000
Subject: Merge branch 'master' of git.sugarlabs.org:chat/mainline

---
(limited to 'activity')

--
cgit v0.9.1