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

[frank.wierzbicki]

http://hg.python.org/jython/rev/8a556c4cc281
changeset:   7026:8a556c4cc281
parent:      7025:53ae75d23e28
parent:      7021:56e560cd6209
user:        Frank Wierzbicki <fwierzbicki at gmail.com>
date:        Sat Feb 09 15:09:36 2013 -0800
summary:
  Merge 2.5.

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


diff --git a/NEWS b/NEWS
--- a/NEWS
+++ b/NEWS
@@ -39,6 +39,10 @@
   Bugs Fixed
     - [ 1988 ] API for threading.condition fails to accept *args for acquire
 
+Jython 2.5.4rc2
+  Bugs Fixed
+    - [ 1988 ] API for threading.condition fails to accept *args for acquire
+
 Jython 2.5.4rc1
   Bugs Fixed
     - [ 1936 ] JBoss 7, vfs protocol in use for jarFileName in PySystemState.

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