changeset:   95631:dd8f48ff9480
parent:      95629:4fb2075952a4
parent:      95630:8e5592a43d65
user:        Łukasz Langa <lukasz@langa.pl>
date:        Tue Apr 14 00:15:42 2015 -0700
files:       Lib/unittest/mock.py Lib/unittest/test/testmock/testmagicmethods.py Misc/ACKS Misc/NEWS
description:
Merge 3.4 (#23310)


diff -r 4fb2075952a4 -r dd8f48ff9480 Misc/ACKS
--- a/Misc/ACKS	Tue Apr 14 09:35:51 2015 +0300
+++ b/Misc/ACKS	Tue Apr 14 00:15:42 2015 -0700
@@ -642,6 +642,7 @@
 Bob Ippolito
 Roger Irwin
 Atsuo Ishimoto
+Kasia Jachim
 Adam Jackson
 Ben Jackson
 Paul Jackson
@@ -849,7 +850,6 @@
 Anne Lord
 Tom Loredo
 Justin Love
-Kasia Jachim
 Ned Jackson Lovely
 Chalmer Lowe
 Jason Lowe