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

Mon Aug 24 22:01:12 CEST 2015

https://hg.python.org/cpython/rev/6de089e4d5b3
changeset: 97478:6de089e4d5b3
branch: 3.5
parent: 97473:ae9a9f201870
parent: 97477:7382e5fe3a40
user: Larry Hastings <larry at hastings.org>
date: Mon Aug 24 12:58:57 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
