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

[frank.wierzbicki]

http://hg.python.org/jython/rev/353121061da9
changeset:   7000:353121061da9
parent:      6998:d77503b7a755
parent:      6999:3345d6e15c79
user:        Frank Wierzbicki <fwierzbicki at gmail.com>
date:        Wed Feb 06 10:09:41 2013 -0800
summary:
  Merge 2.5.

files:
  NEWS |  5 +++++
  1 files changed, 5 insertions(+), 0 deletions(-)


diff --git a/NEWS b/NEWS
--- a/NEWS
+++ b/NEWS
@@ -35,7 +35,12 @@
   Bugs Fixed
     - [ 1880 ] Sha 224 library not present in Jython
 
+Jython 2.5.4rc1
+  Bugs Fixed
+    - [ 1716 ] xrange slicing raises NPE.
+
 Jython 2.5.3rc1
+  Bugs Fixed
     - [ 1952 ] __import__(): Handling of non-dict globals argument incompatible with CPython
     - [ 1900 ] Python imports from Java cause some Python imports to fail
 

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