[Jython-checkins] jython (merge 2.5 -> default): merge with 2.5

[philip.jenvey]

http://hg.python.org/jython/rev/dbe48139a5ab
changeset:   6206:dbe48139a5ab
parent:      6204:416db1c28e21
parent:      6205:c61d91f0de79
user:        Philip Jenvey <pjenvey at underboss.org>
date:        Sat May 07 15:15:17 2011 -0700
summary:
  merge with 2.5

files:
  maven/pom.xml |  6 ++++--
  1 files changed, 4 insertions(+), 2 deletions(-)


diff --git a/maven/pom.xml b/maven/pom.xml
--- a/maven/pom.xml
+++ b/maven/pom.xml
@@ -23,6 +23,8 @@
     	</license>
   	</licenses>
   	<scm>
-  		<url>http://jython.svn.sourceforge.net/viewvc/jython/</url>
+  		<connection>scm:hg:http://hg.python.org/jython</connection>
+  		<developerConnection>scm:hg:ssh://hg@hg.python.org/jython</developerConnection>
+  		<url>http://hg.python.org/jython</url>
   	</scm>
-</project>
\ No newline at end of file
+</project>

-- 
Repository URL: http://hg.python.org/jython