From 14c1b7e7a6a0f6e2cfea117cc3822014f5346d34 Mon Sep 17 00:00:00 2001
From: Walter Bender <walter.bender@gmail.com>
Date: Mon, 16 Jul 2012 15:22:42 +0000
Subject: Merge branch 'master' of git.sugarlabs.org:turtleart/mainline

---
(limited to 'TurtleArt/tapalette.py')

--
cgit v0.9.1