[Jython-checkins] jython (merge 2.5 -> default): merge w/2.5

[alan.kennedy]

http://hg.python.org/jython/rev/cbbc0d996165
changeset:   7031:cbbc0d996165
parent:      7028:d39b428d5c99
parent:      7030:fa5bcc1c80cb
user:        Alan Kennedy <alan at xhaus.com>
date:        Sun Feb 10 11:48:28 2013 +0000
summary:
  merge w/2.5

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


diff --git a/NEWS b/NEWS
--- a/NEWS
+++ b/NEWS
@@ -41,6 +41,7 @@
 
 Jython 2.5.4rc2
   Bugs Fixed
+    - [ 1971 ] platform.py - 'NoneType' object has no attribute 'groups'
     - [ 1988 ] API for threading.condition fails to accept *args for acquire
 
 Jython 2.5.4rc1

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