From a6fb663361428bb69f3d7118d800b0bb5be8704a Mon Sep 17 00:00:00 2001
From: Andrés Ambrois <andresambrois@gmail.com>
Date: Thu, 16 Oct 2008 15:14:55 +0000
Subject: Merge branch 'master' of git+ssh://dev.laptop.org/git/projects/PlayGo

---
(limited to 'collaboration.py')

--
cgit v0.9.1