From 927ae13aec406cd3d3f67d6e10a8ef1f253a0a80 Mon Sep 17 00:00:00 2001
From: Benjamin Berg <benjamin@sipsolutions.net>
Date: Sun, 24 Aug 2008 12:33:58 +0000
Subject: Merge branch 'master' of git+ssh://benzea@dev.laptop.org/git/sugar-toolkit

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

--
cgit v0.9.1