# HG changeset patch
# User Dirkjan Ochtman <dirkjan@ochtman.nl>
# Date 1214983317 -7200
# Node ID b2c4be19d7b1458ce0cf78fe1319aa2639a5947a
# Parent  88a1bcc5c6a7b1729eb97d0509531c0f9f4a606e# Parent  bbd89c9e60123f827b6595b5c1eadd52ba5662af
merge with crew-stable

diff -r 88a1bcc5c6a7 -r b2c4be19d7b1 contrib/win32/mercurial.iss
--- a/contrib/win32/mercurial.iss	Mon Jun 30 10:36:45 2008 +0200
+++ b/contrib/win32/mercurial.iss	Wed Jul 02 09:21:57 2008 +0200
@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 [Setup]
-AppCopyright=Copyright 2005-2007 Matt Mackall and others
+AppCopyright=Copyright 2005-2008 Matt Mackall and others
 AppName=Mercurial
 AppVerName=Mercurial snapshot
 InfoAfterFile=contrib/win32/postinstall.txt
@@ -18,7 +18,7 @@
 DefaultDirName={pf}\Mercurial
 SourceDir=..\..
 VersionInfoDescription=Mercurial distributed SCM
-VersionInfoCopyright=Copyright 2005-2007 Matt Mackall and others
+VersionInfoCopyright=Copyright 2005-2008 Matt Mackall and others
 VersionInfoCompany=Matt Mackall and others
 InternalCompressLevel=max
 SolidCompression=true
diff -r 88a1bcc5c6a7 -r b2c4be19d7b1 mercurial/patch.py
diff -r 88a1bcc5c6a7 -r b2c4be19d7b1 setup.py
--- a/setup.py	Mon Jun 30 10:36:45 2008 +0200
+++ b/setup.py	Wed Jul 02 09:21:57 2008 +0200
@@ -129,7 +129,7 @@
                    [os.path.join(root, file_) for file_ in files])
                   for root, dirs, files in os.walk('templates')],
       cmdclass=cmdclass,
-      options=dict(py2exe=dict(packages=['hgext']),
+      options=dict(py2exe=dict(packages=['hgext', 'email']),
                    bdist_mpkg=dict(zipdist=True,
                                    license='COPYING',
                                    readme='contrib/macosx/Readme.html',