]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge 3.4.
authorStefan Krah <skrah@bytereef.org>
Tue, 26 Aug 2014 19:32:26 +0000 (21:32 +0200)
committerStefan Krah <skrah@bytereef.org>
Tue, 26 Aug 2014 19:32:26 +0000 (21:32 +0200)
1  2 
Lib/decimal.py

diff --cc Lib/decimal.py
Simple merge