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

[frank.wierzbicki]

http://hg.python.org/jython/rev/f6657bf964c6
changeset:   6826:f6657bf964c6
parent:      6824:8c5ec7fccfb2
parent:      6825:d5070c5bfb91
user:        Frank Wierzbicki <fwierzbicki at gmail.com>
date:        Fri Aug 03 13:52:01 2012 -0700
summary:
  Block merge 2.5.

files:



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