From 97b111acee9f613289950ce6904c010e86aa3fb8 Mon Sep 17 00:00:00 2001
From: Jean-Christophe Savard <savard.jean.christophe@gmail.com>
Date: Thu, 16 Apr 2009 20:29:54 +0000
Subject: Merge of jc and origin jc

Merge branch 'jc' of ssh://bobthebuilder.mine.nu:8080/home/git into jc

Conflicts:

	source/external/source/sugar-toolkit/src/sugar/activity/activity.py
	source/external/source/sugar-toolkit/src/sugar/tutorius/Makefile.am
	source/external/source/sugar-toolkit/src/sugar/tutorius/bundler.py
	source/external/source/sugar-toolkit/src/sugar/tutorius/tests/run-tests.py
---
(limited to 'm4')

--
cgit v0.9.1