From 669a771ebb533b58d9117eaafb06fca077c35e5c Mon Sep 17 00:00:00 2001
From: Eben Eliason <eben@sugar.(none)>
Date: Thu, 19 Jun 2008 12:28:04 +0000
Subject: Merge branch 'master' of git+ssh://dev.laptop.org/git/web-activity

---
(limited to 'activity/activity.info')

--
cgit v0.9.1