From 49ab39870266196f6267f83dd6951f839ebde773 Mon Sep 17 00:00:00 2001
From: mike <michael.jmontcalm@gmail.com>
Date: Fri, 04 Dec 2009 02:21:14 +0000
Subject: Merge ../../simpoirs-clone into remote_integration

Conflicts:
	src/extensions/tutoriusremote.py
---
(limited to 'tests/ressources')

--
cgit v0.9.1