From f6a1b8a776edb031709e79c8f45db0fc3340a0ec Mon Sep 17 00:00:00 2001 From: Marion Date: Fri, 21 Jun 2013 15:15:16 +0000 Subject: Merge branch 'master' of git://git.sugarlabs.org/turtleart/mainline Conflicts: TurtleArt/tawindow.py -- accepted everything from mainline --- (limited to 'activity/activity.info') -- cgit v0.9.1