From 2ea94167aa5854840ff0b92242f96e1df8156888 Mon Sep 17 00:00:00 2001
From: Simon Poirier <simpoir@gmail.com>
Date: Wed, 21 Oct 2009 14:05:06 +0000
Subject: Merge branch 'creator' into demo_audit_21_oct

Conflicts:
	tutorius/core.py
---
(limited to 'Workshop.activity/WorkshopModel.py')

--
cgit v0.9.1