From 6fa568daae3291c7a876cd903f04079a12945dcb Mon Sep 17 00:00:00 2001
From: mike <michael.jmontcalm@gmail.com>
Date: Tue, 05 May 2009 05:44:27 +0000
Subject: Merge branch 'mike'

Conflicts:
	source/external/source/sugar-toolkit/src/sugar/tutorius/actions.py
	source/external/source/sugar-toolkit/src/sugar/tutorius/tests/actiontests.py
	source/external/source/sugar-toolkit/src/sugar/tutorius/tests/run-tests.py
---
(limited to 'src/sugar/tutorius/services.py')

diff --git a/src/sugar/tutorius/services.py b/src/sugar/tutorius/services.py
index 467eca0..9ed2e50 100644
--- a/src/sugar/tutorius/services.py
+++ b/src/sugar/tutorius/services.py
@@ -66,3 +66,4 @@ class ObjectStore(object):
         tutorial = property(fset=set_tutorial,fget=get_tutorial,doc="tutorial")
 
     __doc__ = __ObjectStore.__doc__
+
--
cgit v0.9.1