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

[benjamin.peterson]

http://hg.python.org/cpython/rev/4fc571a04c9c
changeset:   91247:4fc571a04c9c
parent:      91244:abcf17bc5eae
parent:      91246:6ea2894fb983
user:        Benjamin Peterson <benjamin at python.org>
date:        Tue Jun 17 09:45:20 2014 -0700
summary:
  merge 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
@@ -174,6 +174,7 @@
 Tobias Brink
 Richard Brodie
 Michael Broghton
+Ammar Brohi
 Daniel Brotsky
 Jean Brouwers
 Gary S. Brown

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