From: Greg Gay <ggay@ocad.ca>
Date: Wed, 21 Sep 2011 17:54:49 +0000 (-0400)
Subject: Merge branches 'master' and 'new_feature' into new_feature
X-Git-Url: https://iam.tj/gitweb/gitweb.cgi?p=atutor.git;a=commitdiff_plain;h=416c2133476d1f67ea5afaa2334ae91f958d8808;hp=e454d50aefd0b4c7c6e7fc2ab44dfd817ba77cc2

Merge branches 'master' and 'new_feature' into new_feature
---

diff --git a/readme b/readme
index ac4485028..7f1345c35 100644
--- a/readme
+++ b/readme
@@ -15,6 +15,3 @@ If you wish to have code you've developed added to the ATutor public source code
 
 See: http://wiki.atutor.ca/display/atutorwiki/Using+Git+and+GitHub
 
-
-
-