[Python-checkins] cpython (merge 3.4 -> default): Merge with 3.4

[zach.ware]

https://hg.python.org/cpython/rev/27856e7dbcd1
changeset:   95575:27856e7dbcd1
parent:      95572:ef6c4712cc28
parent:      95574:19f6f339af7e
user:        Zachary Ware <zachary.ware at gmail.com>
date:        Mon Apr 13 11:08:55 2015 -0500
summary:
  Merge with 3.4

files:
  Misc/ACKS |  1 +
  1 files changed, 1 insertions(+), 0 deletions(-)


diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -351,6 +351,7 @@
 Marcos Donolo
 Dima Dorfman
 Yves Dorfsman
+Michael Dorman
 Cesar Douady
 Dean Draayer
 Fred L. Drake, Jr.

-- 
Repository URL: https://hg.python.org/cpython