From aa2d1d42f01f87b5a0a7e533bb6a93d3720b9d1a Mon Sep 17 00:00:00 2001
From: Walter Bender <walter.bender@gmail.com>
Date: Mon, 21 Feb 2011 23:00:50 +0000
Subject: Merge git.sugarlabs.org:~walter/turtleart/collaboration-refactoring

Conflicts:
	NEWS
	TurtleArt/talogo.py
---
(limited to 'turtleart.desktop')

--
cgit v0.9.1