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

[frank.wierzbicki]

http://hg.python.org/jython/rev/d7e04f80af9a
changeset:   6844:d7e04f80af9a
parent:      6842:f4f057830c2b
parent:      6843:c56500f08d34
user:        Frank Wierzbicki <fwierzbicki at gmail.com>
date:        Mon Aug 13 14:34:53 2012 -0700
summary:
  Merge 2.5.

files:
  .hgtags |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -62,4 +62,4 @@
 d5070c5bfb914eb5f8381d70fd58316bd264f31b v2.5.3rc1
 4f5e3c12edc040058d724d4469a53e8649e64420 v2.7.0a1
 ac5609677c1382f14d0e04178fe6dd4108e4c231 v2.7.0a2
-3d2dbae23c5292b7f31ac4c92fa6d1afd8bd8eb2 2.5.3
+3d2dbae23c5292b7f31ac4c92fa6d1afd8bd8eb2 v2.5.3

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