diff mercurial/mail.py @ 10264:d6512b3e9ac0

Merge with stable
author Matt Mackall <mpm@selenic.com>
date Tue, 19 Jan 2010 22:45:09 -0600
parents e5b44a7986d0 25e572394f5c
children 594b98846ce1
line wrap: on
line diff
--- a/mercurial/mail.py	Mon Jan 18 22:59:32 2010 +0100
+++ b/mercurial/mail.py	Tue Jan 19 22:45:09 2010 -0600
@@ -3,7 +3,7 @@
 # Copyright 2006 Matt Mackall <mpm@selenic.com>
 #
 # This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
 
 from i18n import _
 import util, encoding