[Python-checkins] peps (merge default -> default): Merge

[antoine.pitrou]

http://hg.python.org/peps/rev/5ab6d6aace71
changeset:   3963:5ab6d6aace71
parent:      3962:f50f0e14c774
parent:      3961:55bd9678e8ac
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Thu Oct 13 02:01:28 2011 +0200
summary:
  Merge

files:
  pep-0335.txt |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/pep-0335.txt b/pep-0335.txt
--- a/pep-0335.txt
+++ b/pep-0335.txt
@@ -2,7 +2,7 @@
 Title: Overloadable Boolean Operators
 Version: $Revision$
 Last-Modified: $Date$
-Author: Gregory Ewing <greg at cosc.canterbury.ac.nz>
+Author: Gregory Ewing <greg.ewing at canterbury.ac.nz>
 Status: Draft
 Type: Standards Track
 Content-Type: text/x-rst

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