From: Senthil Kumaran <senthil@uthcode.com>
Date: Fri, 23 Dec 2011 02:54:11 +0000 (+0800)
Subject: Merge changes from 3.2
X-Git-Tag: v3.3.0a1~537
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cc4ff04bdd7b7030f3474f6fb2f40e7b6b777b8d;p=thirdparty%2FPython%2Fcpython.git

Merge changes from 3.2

Issue12798 - Update mimetypes documentation. Correct the doc section where
common_types was mentioned under MimeTypes class, move it to helper function
category and other documentation improvements contributed by Sandro Tosi.
---

cc4ff04bdd7b7030f3474f6fb2f40e7b6b777b8d