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

[raymond.hettinger]

https://hg.python.org/cpython/rev/4172e0a4e07a
changeset:   105913:4172e0a4e07a
parent:      105911:c3a6e5fdfdc6
parent:      105912:cd811b867393
user:        Raymond Hettinger <python at rcn.com>
date:        Sat Dec 31 12:08:19 2016 -0700
summary:
  merge

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
@@ -157,6 +157,7 @@
 Paul Boddie
 Matthew Boedicker
 Robin Boerdijk
+Andra Bogildea
 Nikolay Bogoychev
 David Bolen
 Wouter Bolsterlee

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