# HG changeset patch
# User raph
# Date 1287758395 -7200
# Node ID 884e94895d69d0738425958cadbb0c933e0c4b1b
# Parent  5b15e43001da807305e12ca86d8d4e411a2ba3d3# Parent  addba77f2f901c689d9abed3d4ce2c5d25fef5f1
Merge with addba77f2f901c689d9abed3d4ce2c5d25fef5f1

diff -r 5b15e43001da -r 884e94895d69 src/cm/client.py
--- a/src/cm/client.py	Fri Oct 22 16:38:42 2010 +0200
+++ b/src/cm/client.py	Fri Oct 22 16:39:55 2010 +0200
@@ -1,4 +1,8 @@
-from django.forms.fields import email_re
+try:
+    from django.core.validators import email_re
+except ImportError:
+    # support for django pre 1.2 alpha 1
+    from django.forms.fields import email_re
 from django.http import HttpResponse, HttpResponseRedirect
 from django.core.exceptions import ObjectDoesNotExist
 from django.forms import ValidationError
diff -r 5b15e43001da -r 884e94895d69 src/cm/migrations/0004_uniqueness_to_keys_in_textversion.py
--- a/src/cm/migrations/0004_uniqueness_to_keys_in_textversion.py	Fri Oct 22 16:38:42 2010 +0200
+++ b/src/cm/migrations/0004_uniqueness_to_keys_in_textversion.py	Fri Oct 22 16:39:55 2010 +0200
@@ -13,9 +13,9 @@
 
         db.create_index('cm_textversion', ['adminkey', ], unique=True)
 
-        db.create_unique('cm_textversion', ['key', ])
+        #db.create_unique('cm_textversion', ['key', ])
 
-        db.create_unique('cm_textversion', ['adminkey', ])
+        #db.create_unique('cm_textversion', ['adminkey', ])
         
         
     def backwards(self, orm):