From 81ba8fd9fa0e2fbbee1ef3534a96104de4cd7079 Mon Sep 17 00:00:00 2001
From: Walter Bender <walter@sugarlabs.org>
Date: Wed, 17 Mar 2010 18:39:20 +0000
Subject: Merge branch 'master' of git://git.sugarlabs.org/turtleart/refactoring

Conflicts:
	NEWS
	activity/activity.info
	tagplay.py
	tawindow.py
---
(limited to 'COPYING')

diff --git a/COPYING b/COPYING
index a817f22..d2954ad 100644
--- a/COPYING
+++ b/COPYING
@@ -1,4 +1,6 @@
-Copyright (c) 2007-9, Playful Invention Company, Sugar Labs
+Copyright (c) 2007, Playful Invention Company
+Copyright (c) 2008-10, Walter Bender
+Copyright (c) 2009-10 Raúl Gutiérrez Segalés
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
--
cgit v0.9.1