]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
projects / thirdparty / Python / cpython.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3cb0906 2502ebf)
Merge with 3.3
authorBrian Curtin <brian@python.org>
Thu, 16 May 2013 17:03:40 +0000 (12:03 -0500)
committerBrian Curtin <brian@python.org>
Thu, 16 May 2013 17:03:40 +0000 (12:03 -0500)
1  2 
Misc/ACKS patch | diff1 | diff2 | blob | history

diff --cc Misc/ACKS
index 6d08530fbe03f81f4eaa61d36ba5018e84ce93fe,b47accffaa101c5108abe7e4a0ab5c922efe9522..6adb14a145cdc5d9cab699fefa2ec3b0201bf5a5
--- 1/Misc/ACKS
--- 2/Misc/ACKS
+++ b/Misc/ACKS
@@@ -1161,7 -1137,7 +1161,8 @@@ George Sip
  J. Sipprell
  Kragen Sitaker
  Michael Sloan
+ Nick Sloan
 +Václav Šmilauer
  Christopher Smith
  Eric V. Smith
  Gregory P. Smith
Mirror of https://github.com/python/cpython.git