Merged revisions 62369 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r62369 | file | 2007-04-30 11:36:11 -0300 (Mon, 30 Apr 2007) | 10 lines

Merged revisions 62368 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r62368 | file | 2007-04-30 11:34:07 -0300 (Mon, 30 Apr 2007) | 2 lines

Update copyright notice. It's now the year 2007!

........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@62370 65c4cc65-6c06-0410-ace0-fbb531ad65f3

main/asterisk.c

@@ -141,7 +141,7 @@ int daemon(int, int);  /* defined in libresolv of all places */
 
 /*! \brief Welcome message when starting a CLI interface */
 #define WELCOME_MESSAGE \
-    ast_verbose("Asterisk " ASTERISK_VERSION ", Copyright (C) 1999 - 2006 Digium, Inc. and others.\n" \
+    ast_verbose("Asterisk " ASTERISK_VERSION ", Copyright (C) 1999 - 2007 Digium, Inc. and others.\n" \
                 "Created by Mark Spencer <markster@digium.com>\n" \
                 "Asterisk comes with ABSOLUTELY NO WARRANTY; type 'core show warranty' for details.\n" \
                 "This is free software, with components licensed under the GNU General Public\n" \
@@ -2336,7 +2336,7 @@ static int show_version(void)
 }
 
 static int show_cli_help(void) {
-	printf("Asterisk " ASTERISK_VERSION ", Copyright (C) 1999 - 2006, Digium, Inc. and others.\n");
+	printf("Asterisk " ASTERISK_VERSION ", Copyright (C) 1999 - 2007, Digium, Inc. and others.\n");
 	printf("Usage: asterisk [OPTIONS]\n");
 	printf("Valid Options:\n");
 	printf("   -V              Display version number and exit\n");