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

[frank.wierzbicki]

http://hg.python.org/jython/rev/5170073d6fbb
changeset:   6425:5170073d6fbb
parent:      6423:b42f84befe07
parent:      6424:7f45511459a8
user:        Frank Wierzbicki <fwierzbicki at gmail.com>
date:        Mon Mar 19 20:31:49 2012 -0700
summary:
  Merge from 2.5.

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


diff --git a/NEWS b/NEWS
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,11 @@
 Jython NEWS
 
+Jython 2.7a1
+  Bugs Fixed
+
 Jython 2.5.3b2
   Bugs Fixed
+    - [ 1721 ] NPE when using JSR 223 (TestCase+Patch)
     - [ 1536 ] NPE in org.python.jsr223.PyScriptEngine:187
     - [ 1829 ] test_socket.py failing on Ubuntu (Oneiric)
     - [ 1844 ] bad host returned by getsockname

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