From f02b9202add548f259f4d05b7edb2d39a9206b2a Mon Sep 17 00:00:00 2001
From: charles <iso.swiffer@gmail.com>
Date: Thu, 16 Apr 2009 15:31:35 +0000
Subject: Merge branch 'jc' of ssh://charles@bobthebuilder.mine.nu:8080/home/git into jc

---
(limited to 'src/sugar/activity/activity.py')

--
cgit v0.9.1