From: Łukasz Langa <lukasz@langa.pl>
Date: Tue, 14 Apr 2015 07:15:42 +0000 (-0700)
Subject: Merge 3.4 (#23310)
X-Git-Tag: v3.5.0a4~63
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e91ecb2b3416701c22ac849d570683097ad01d60;p=python

Merge 3.4 (#23310)
---

e91ecb2b3416701c22ac849d570683097ad01d60
diff --cc Misc/ACKS
index 2a5236e9e5,7de6de6d42..75a34d4a73
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@@ -849,9 -833,7 +850,8 @@@ Hugo Lopes Tavare
  Anne Lord
  Tom Loredo
  Justin Love
- Kasia Jachim
  Ned Jackson Lovely
 +Chalmer Lowe
  Jason Lowe
  Tony Lownds
  Ray Loyzaga