Merge commit 'de5097ca6a7f2b3ec55a98d1d803c2f8d4134e5b'

mozilla · Jan 27, 2012 · ac36138 · ac36138
2 parents f19ec3c + de5097c
commit ac36138
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,9 +1,6 @@
 [submodule "src/django"]
 	path = src/django
 	url = git://github.com/django/django
-[submodule "src/django-browserid"]
-	path = src/django-browserid
-	url = git://github.com/mozilla/django-browserid.git
 [submodule "src/django-sha2"]
 	path = src/django-sha2
 	url = git://github.com/fwenzel/django-sha2.git
@@ -67,3 +64,6 @@
 [submodule "src/pyes"]
 	path = src/pyes
 	url = git://github.com/aparo/pyes.git
+[submodule "src/django-browserid"]
+	path = src/django-browserid
+	url = git://github.com/tallowen/django-browserid.git
diff --git a/src/django-browserid b/src/django-browserid
diff --git a/vendor.pth b/vendor.pth
@@ -21,3 +21,4 @@ src/test-utils
 src/tower
 src/elasticutils
 src/pyes
+src/django-browserid