From d8c30900e0ac41fac0cd72975b593502c6f6b752 Mon Sep 17 00:00:00 2001
From: Lucian Branescu Mihaila <lucian.branescu@gmail.com>
Date: Mon, 25 Oct 2010 08:37:37 +0000
Subject: Merge branch 'master' of git.sugarlabs.org:browse/mainline into sucrose-0.90

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

--
cgit v0.9.1