Merge branch 'dic'

jeromemacias · jeromemacias · commit 98f4306eecc9 · 2011-12-25T21:42:10.000+01:00
diff --git a/.gitmodules b/.gitmodules
@@ -1,6 +1,6 @@
-[submodule "lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine"]
-	path = lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine
-	url = https://github.com/doctrine/doctrine1.git
 [submodule "lib/vendor/swiftmailer"]
 	path = lib/vendor/swiftmailer
 	url = https://github.com/swiftmailer/swiftmailer.git
+[submodule "lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine"]
+	path = lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine
+	url = git://github.com/LExpress/doctrine1.git
diff --git a/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine b/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine
@@ -1 +1 @@
-Subproject commit d6f70c460bc4d200e3c65616bbc61f79b2e51cb4
+Subproject commit aec78cf142e328742507f268dc6710dc63781d70
