From: Senthil Kumaran <senthil@uthcode.com>
Date: Wed, 25 Jun 2014 08:13:19 +0000 (-0700)
Subject: merge from 3.4
X-Git-Tag: v3.5.0a1~1412
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b057970f0d4e902d2e9837a07c4ae78f4fc55bb1;p=thirdparty%2FPython%2Fcpython.git

merge from 3.4

issue15588 - Correct the quopri module documentation. Mention the correct types
of the parameters on encodestring and decodestring.

Patch by Petri Lehtinen.
---

b057970f0d4e902d2e9837a07c4ae78f4fc55bb1