Merge

2012-03-12 16:59:06 -07:00 · 2012-03-12 16:59:06 -07:00 · 9691313918
parent c563864d0c 17b82b9ab7
commit 9691313918
1 changed files with 2 additions and 1 deletions
--- a/pep-0417.txt
+++ b/pep-0417.txt
@ -3,12 +3,13 @@ Title: Including mock in the Standard Library
 Version: $Revision$
 Last-Modified: $Date$
 Author: Michael Foord <michael@python.org>
-Status: Draft
+Status: Accepted
 Type: Standards Track
 Content-Type: text/x-rst
 Created: 12-Mar-2012
 Python-Version: 3.3
 Post-History: 12-Mar-2012
+Resolution: http://mail.python.org/pipermail/python-dev/2012-March/117507.html


 Abstract