From a3631cdcb01879ad1d0b8ed5454a6c581ba14300 Mon Sep 17 00:00:00 2001
From: erick <erick@sugar-dev-erick.(none)>
Date: Fri, 30 Oct 2009 22:22:33 +0000
Subject: Merge branch 'master' of git://git.sugarlabs.org/tutorius/mainline

---
(limited to 'setup.cfg.example')

--
cgit v0.9.1