From: Hynek Schlawack <hs@ox.cx>
Date: Mon, 8 Oct 2012 05:46:11 +0000 (+0200)
Subject: Merge 3.3
X-Git-Tag: v3.4.0a1~2306
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c3c6fe5b1a8cd718cf1d96981427021f86f75fd3;p=python

Merge 3.3
---

c3c6fe5b1a8cd718cf1d96981427021f86f75fd3
diff --cc Misc/NEWS
index 422e674097,59ccb45e3b..b44f1ae4bc
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -152,6 -121,6 +152,9 @@@ Buil
  Documentation
  -------------
  
++- Issue #13498: Clarify docs of os.makedirs()'s exist_ok argument.  Done with
++  great native-speaker help from R. David Murray.
++
  - Issue #15533: Clarify docs and add tests for `subprocess.Popen()`'s cwd
    argument.