]> granicus.if.org Git - python/commit
Merge
authorMichael Foord <michael@voidspace.org.uk>
Tue, 15 Apr 2014 21:22:22 +0000 (17:22 -0400)
committerMichael Foord <michael@voidspace.org.uk>
Tue, 15 Apr 2014 21:22:22 +0000 (17:22 -0400)
commit15f2d1775e64b3ae0742f0faae108bc3d6e3d5e4
tree67a93e8c6553d0d8d3153fdf657cb72194d4305d
parent27adf4469023597883d9240ad40a7a52d81b6f66
parentebc1a30d55f07d590d62504c3f097cb8a15ee7d3
Merge
Lib/unittest/mock.py
Lib/unittest/test/testmock/testpatch.py
Misc/NEWS