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

[frank.wierzbicki]

http://hg.python.org/jython/rev/967bfe23ac3c
changeset:   6505:967bfe23ac3c
parent:      6503:60346d729b91
parent:      6504:c7f648b3e03a
user:        Frank Wierzbicki <fwierzbicki at gmail.com>
date:        Thu Mar 29 13:51:35 2012 -0700
summary:
  Merge from 2.5.

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


diff --git a/NEWS b/NEWS
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,7 @@
 
 Jython 2.5.3b2
   Bugs Fixed
+    - [ 1837 ] gderived.py and template Ant target fail on Windows
     - [ 1536 ] NPE in org.python.jsr223.PyScriptEngine:187
     - [ 1640 ] cStringIO does not complain on getvalue after close
     - [ 1721 ] NPE when using JSR 223 (TestCase+Patch)

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