Merge branch 'master' into penfield

diff --git a/models.py b/models.py
index 39f166c..1c71889 100644 (file)
--- a/models.py
+++ b/models.py
@@ -291,9 +291,6 @@ class File(Node):
                response = HttpResponse(wrapper, content_type=self.mimetype)
                response['Content-Length'] = self.file.size
                return response
-       
-       def __unicode__(self):
-               return self.file
 
 
 class Template(TreeModel):