From: Senthil Kumaran <senthil@uthcode.com>
Date: Fri, 8 Jan 2016 09:03:03 +0000 (-0800)
Subject: merge from 3.5
X-Git-Tag: v3.6.0a1~811
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fd65958f4f8698aa147369ccf795f19aee17eef2;p=thirdparty%2FPython%2Fcpython.git

merge from 3.5

Issue20969 - Set the Epub Author and Epub Publisher in Python docs.
---

fd65958f4f8698aa147369ccf795f19aee17eef2