From e30379af951e1fe12d362c47d589cab58f4ffa57 Mon Sep 17 00:00:00 2001
From: Benjamin Saller <bcsaller@objectrealms.net>
Date: Fri, 20 Jul 2007 19:00:42 +0000
Subject: Merge branch 'master' of git+ssh://dev.laptop.org/git/projects/datastore

---
diff --git a/src/olpc/datastore/model.py b/src/olpc/datastore/model.py
index 9f51cf6..46f2225 100644
--- a/src/olpc/datastore/model.py
+++ b/src/olpc/datastore/model.py
@@ -360,6 +360,7 @@ defaultModel = Model().addFields(
 
     # olpc specific
     ('activity', 'string'),
+    ('activity_id', 'string'),
     ('title_set_by_user', 'text'),
     ('keep', 'int'),
     ('icon-color', 'string'),
--
cgit v0.9.1