[Python-checkins] cpython (merge default -> default): Merge.

Mon Aug 24 22:01:13 CEST 2015

https://hg.python.org/cpython/rev/b597d234c09d
changeset: 97479:b597d234c09d
parent: 97474:ccde4da4d0de
parent: 97476:283d7aa763ee
user: Larry Hastings <larry at hastings.org>
date: Mon Aug 24 12:59:38 2015 -0700
summary:
 Merge.
files:
 Doc/whatsnew/3.5.rst | 2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Doc/whatsnew/3.5.rst b/Doc/whatsnew/3.5.rst
--- a/Doc/whatsnew/3.5.rst
+++ b/Doc/whatsnew/3.5.rst
@@ -729,7 +729,7 @@
 
 * New :func:`~os.path.commonpath` function that extracts common path prefix.
 Unlike the :func:`~os.path.commonprefix` function, it always returns a valid
- patch. (Contributed by Rafik Draoui and Serhiy Storchaka in :issue:`10395`.)
+ path. (Contributed by Rafik Draoui and Serhiy Storchaka in :issue:`10395`.)
 
 pickle
 ------
-- 
Repository URL: https://hg.python.org/cpython
