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

[terry.reedy]

http://hg.python.org/cpython/rev/a8a238cf59c7
changeset:   83089:a8a238cf59c7
parent:      83086:7a3a2009310f
parent:      83088:3daa20ce817e
user:        Terry Jan Reedy <tjreedy at udel.edu>
date:        Wed Apr 03 13:20:02 2013 -0400
summary:
  Merge with 3.3

files:
  Misc/NEWS |  2 ++
  1 files changed, 2 insertions(+), 0 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -1251,6 +1251,8 @@
 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.

-- 
Repository URL: http://hg.python.org/cpython