From dba2da918dda60778a35e992ffc8f94989272977 Mon Sep 17 00:00:00 2001
From: mike <michael.jmontcalm@gmail.com>
Date: Wed, 22 Apr 2009 19:01:01 +0000
Subject: Merge branch 'jc' of ssh://mike@bobthebuilder.mine.nu:8080/home/git into jc_support

Conflicts:

	source/external/source/sugar-toolkit/src/sugar/tutorius/bundler.py
	source/external/source/sugar-toolkit/src/sugar/tutorius/tests/serializertests.py
---
(limited to 'src/sugar/tutorius/actions.py')

--
cgit v0.9.1