From d0ba388ef032e348b082a69f90e0a0deb7460eda Mon Sep 17 00:00:00 2001
From: Rafael Ortiz <rafael@activitycentral.com>
Date: Wed, 28 Nov 2012 19:48:39 +0000
Subject: Merge branch 'master' of git.sugarlabs.org:speak/mainline

---
(limited to 'activity')

--
cgit v0.9.1