From ba9f4907b6455998e22b6feac0d6bb086373bc02 Mon Sep 17 00:00:00 2001
From: Walter Bender <walter@sugarlabs.org>
Date: Sat, 14 Dec 2013 17:35:00 +0000
Subject: Merge commit 'refs/merge-requests/4' of git://git.sugarlabs.org/physics/mainline into merge-requests/4

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

--
cgit v0.9.1