From: Senthil Kumaran <senthil@uthcode.com>
Date: Fri, 20 Jun 2014 08:38:37 +0000 (-0700)
Subject: merge from 3.4
X-Git-Tag: v3.5.0a1~1443^2~3^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2b313759561a88b23c93a7f25bfa9429f0b1ea2f;p=thirdparty%2FPython%2Fcpython.git

merge from 3.4

issue 20091 - index entry for __main__ in runpy docs.
---

2b313759561a88b23c93a7f25bfa9429f0b1ea2f