From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Date: Sat, 26 May 2012 02:48:27 +0000 (+0100)
Subject: Merged upstream changes.
X-Git-Tag: v3.3.0a4~62
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b5267631cb2a62088ef12b36abd0317957244c6c;p=thirdparty%2FPython%2Fcpython.git

Merged upstream changes.
---

b5267631cb2a62088ef12b36abd0317957244c6c
diff --cc Misc/NEWS
index 23ad604486e9,26cd7aafb3d6..369b1a51b25c
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -10,6 -10,6 +10,8 @@@ What's New in Python 3.3.0 Alpha 4
  Core and Builtins
  -----------------
  
++- Issue #14712 (PEP 405): Virtual environments. Implemented by Vinay Sajip.
++
  - Issue #14660 (PEP 420): Namespace packages. Implemented by Eric Smith.
  
  - Issue #14494: Fix __future__.py and its documentation to note that