From 638125ecc532710596da8c846f4c636cdc82a897 Mon Sep 17 00:00:00 2001
From: Rafael Ortiz <rafael@activitycentral.com>
Date: Fri, 23 Nov 2012 15:32:03 +0000
Subject: Merge branch 'master' of git.sugarlabs.org:speak/mainline

---
(limited to 'activity')

--
cgit v0.9.1