]> granicus.if.org Git - python/commitdiff
Issue22506: merge from 3.4
authorEthan Furman <ethan@stoneleaf.us>
Tue, 14 Oct 2014 15:59:14 +0000 (08:59 -0700)
committerEthan Furman <ethan@stoneleaf.us>
Tue, 14 Oct 2014 15:59:14 +0000 (08:59 -0700)
1  2 
Lib/enum.py
Lib/test/test_enum.py

diff --cc Lib/enum.py
Simple merge
Simple merge