[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-2640-g3d01248

[Jeremy Allison]

The branch, v3-3-test has been updated
       via  3d01248f63d0d476c16236453983ffe759d0b2c2 (commit)
       via  9f5897e28dfa0d0563cd2568b4bedc601681e41b (commit)
      from  5f6b301f92e9e9d5ee1dab9ef8eca2cc77e12941 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test


- Log -----------------------------------------------------------------
commit 3d01248f63d0d476c16236453983ffe759d0b2c2
Merge: 9f5897e28dfa0d0563cd2568b4bedc601681e41b 5f6b301f92e9e9d5ee1dab9ef8eca2cc77e12941
Author: Jeremy Allison <jra at samba.org>
Date:   Fri May 30 10:09:22 2008 -0700

    Merge branch 'v3-3-test' of ssh://jra@git.samba.org/data/git/samba into v3-3-test

commit 9f5897e28dfa0d0563cd2568b4bedc601681e41b
Author: Jeremy Allison <jra at samba.org>
Date:   Fri May 30 10:08:27 2008 -0700

    From Michael R Sweet <mike at easysw.com>.
    
    All,
    
    Noticed that smbspool.c still has my Easy Software Products copyright
    on it.  The following patch fixes it to match the other code I've
    contributed over the years...
    
    Jeremy.

-----------------------------------------------------------------------

Summary of changes:
 source/client/smbspool.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/client/smbspool.c b/source/client/smbspool.c
index ed5fc69..e567ef8 100644
--- a/source/client/smbspool.c
+++ b/source/client/smbspool.c
@@ -2,7 +2,7 @@
    Unix SMB/CIFS implementation.
    SMB backend for the Common UNIX Printing System ("CUPS")
 
-   Copyright (C) Easy Software Products	    1999
+   Copyright (C) Michael R Sweet            1999
    Copyright (C) Andrew Tridgell	    1994-1998
    Copyright (C) Andrew Bartlett	    2002
    Copyright (C) Rodrigo Fernandez-Vizarra  2005


-- 
Samba Shared Repository