From efde4e823dc4418763514e0634fc3c1393ba36d8 Mon Sep 17 00:00:00 2001
From: amartin <olpc@localhost.localdomain>
Date: Tue, 27 Feb 2007 06:45:35 +0000
Subject: Merge branch 'master' of git+ssh://amartin@dev.laptop.org/git/projects/tamtam

Conflicts:

	Edit/MainWindow.py
---
(limited to 'scripts/activity-install.sh')

--
cgit v0.9.1