Merge branch 'master' of git://git.sugarlabs.org/turtleart/refactoringv83

Conflicts:
	NEWS
	activity/activity.info
	tagplay.py
	tawindow.py

1 files changed, 26 insertions, 0 deletions

diff --git a/samples/images/COPYING b/samples/images/COPYING
new file mode 100644
index 0000000..1f28fd3
--- /dev/null
+++ b/samples/images/COPYING
@@ -0,0 +1,26 @@
+Permission is granted to copy, distribute and/or modify these documents
+under the terms of the GNU Free Documentation License, Version 1.2 or
+any later version published by the Free Software Foundation; with no
+Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. A
+copy of the license is included in the section entitled "GNU Free
+Documentation License".
+
+Riptor3000 is the copyright holder of Boston.png (retreived from the
+Wikipedia and modified by Walter Bender, 2010).
+
+Pythagoras is from the Wikimedia Commons, uploaded in 2007 by Galilea.
+
+Elise Bender is the copyright holder of me.jpg
+
+World_Map.png was retrieved from the Wikipedia and modified by Walter
+Bender in 2009, 2010.
+
+Africa.png, Australia.png, Eurasia.png, North_America.png, and
+South_America.png are modifications of World_Map.png made by Jalen
+Basquiet and Walter Bender in 2009, 2010.
+
+earth.png, Massachusetts.png, North_America.jpg, and United_States.png
+were retrieved from the Wikipedia and modified by Walter Bender in
+2009, 2010.
+
+