From 9c38b6758cbed458826e1ec7d801ea09aa5e606d Mon Sep 17 00:00:00 2001
From: Walter Bender <walter.bender@gmail.com>
Date: Mon, 01 Apr 2013 17:44:49 +0000
Subject: Merge branch 'master' of git.sugarlabs.org:turtleart/mainline

---
diff --git a/.arcconfig b/.arcconfig
new file mode 100644
index 0000000..4c2c94f
--- /dev/null
+++ b/.arcconfig
@@ -0,0 +1,4 @@
+{
+  "project_id" : "turtleart",
+  "conduit_uri" : "http://phabricator.itevenworks.net/"
+}
diff --git a/.gitignore b/.gitignore
index 737cf64..f3d74a9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,2 @@
 *.pyc
 *~
-*.pyo
diff --git a/TurtleArtActivity.py b/TurtleArtActivity.py
index 65b176c..2583a0c 100644
--- a/TurtleArtActivity.py
+++ b/TurtleArtActivity.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #Copyright (c) 2007, Playful Invention Company
 #Copyright (c) 2008-13, Walter Bender
-#Copyright (c) 2009-10 Raul Gutierrez Segales
+#Copyright (c) 2009-13 Raul Gutierrez Segales
 #Copyright (c) 2012 Alan Aguiar
 
 #Permission is hereby granted, free of charge, to any person obtaining a copy
--
cgit v0.9.1