]> granicus.if.org Git - python/commitdiff
Merge with 3.2.
authorGeorg Brandl <georg@python.org>
Sat, 10 Mar 2012 08:27:30 +0000 (09:27 +0100)
committerGeorg Brandl <georg@python.org>
Sat, 10 Mar 2012 08:27:30 +0000 (09:27 +0100)
1  2 
Lib/re.py

diff --cc Lib/re.py
Simple merge