From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Wed, 3 Apr 2013 17:20:02 +0000 (-0400)
Subject: Merge with 3.3
X-Git-Tag: v3.4.0a1~1034
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8fc16b37ea229ff7090fa6fb23c403e91a0b25a5;p=python

Merge with 3.3
---

8fc16b37ea229ff7090fa6fb23c403e91a0b25a5
diff --cc Misc/NEWS
index 856f893090,03f9e2f8f7..7e8712fbf2
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -1251,6 -914,12 +1251,8 @@@ Buil
  Documentation
  -------------
  
++- Issue #15940: Specify effect of locale on time functions.
++
  - Issue 17538: Document XML vulnerabilties
  
  - Issue #16642: sched.scheduler timefunc initial default is time.monotonic.