From: Zachary Ware <zachary.ware@gmail.com>
Date: Tue, 20 Jan 2015 20:11:38 +0000 (-0600)
Subject: Merge with 3.4 (closes #23280)
X-Git-Tag: v3.5.0a1~139
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b4826c3fd160375903b1380b09490a016771d7c9;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.4 (closes #23280)
---

b4826c3fd160375903b1380b09490a016771d7c9
diff --cc Modules/clinic/binascii.c.h
index 6147be917958,f647032ada84..b2b6e6b4faf2
--- a/Modules/clinic/binascii.c.h
+++ b/Modules/clinic/binascii.c.h
@@@ -475,4 -543,4 +543,4 @@@ exit
  
      return return_value;
  }
- /*[clinic end generated code: output=53cd6b379c745220 input=a9049054013a1b77]*/
 -/*[clinic end generated code: output=e46d29f8c9adae7e input=a9049054013a1b77]*/
++/*[clinic end generated code: output=771126f8f53e84e7 input=a9049054013a1b77]*/