]> granicus.if.org Git - python/commitdiff
Merge 3.4.
authorStefan Krah <skrah@bytereef.org>
Tue, 26 Aug 2014 18:47:32 +0000 (20:47 +0200)
committerStefan Krah <skrah@bytereef.org>
Tue, 26 Aug 2014 18:47:32 +0000 (20:47 +0200)
1  2 
Lib/decimal.py
Lib/test/test_decimal.py

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