]> granicus.if.org Git - python/commitdiff
#14236: merge with 3.2.
authorEzio Melotti <ezio.melotti@gmail.com>
Sun, 29 Apr 2012 10:37:13 +0000 (13:37 +0300)
committerEzio Melotti <ezio.melotti@gmail.com>
Sun, 29 Apr 2012 10:37:13 +0000 (13:37 +0300)
1  2 
Lib/re.py

diff --cc Lib/re.py
Simple merge