From: Wilfried Goesgens <dothebart@citadel.org>
Date: Tue, 21 Jan 2014 20:28:21 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
X-Git-Tag: v9.01~146
X-Git-Url: https://code.citadel.org/?a=commitdiff_plain;h=63e464108af57afa166d59a574479d5309cc4d9c;hp=691c6e859b97b00b6106fa46f42cbdd45f01a8a9;p=citadel.git

Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
---

diff --git a/citadel/server_main.c b/citadel/server_main.c
index 054c80547..9da255b50 100644
--- a/citadel/server_main.c
+++ b/citadel/server_main.c
@@ -1,7 +1,7 @@
 /*
  * citserver's main() function lives here.
  * 
- * Copyright (c) 1987-2013 by the citadel.org team
+ * Copyright (c) 1987-2014 by the citadel.org team
  *
  * This program is open source software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3.
@@ -153,7 +153,7 @@ int main(int argc, char **argv)
 	syslog(LOG_NOTICE,
 		"*** Citadel server engine v%d.%02d (build %s) ***",
 		(REV_LEVEL/100), (REV_LEVEL%100), svn_revision());
-	syslog(LOG_NOTICE, "Copyright (C) 1987-2013 by the Citadel development team.");
+	syslog(LOG_NOTICE, "Copyright (C) 1987-2014 by the Citadel development team.");
 	syslog(LOG_NOTICE, "This program is distributed under the terms of the GNU "
 					"General Public License.");
 	syslog(LOG_NOTICE, " ");
diff --git a/webcit/webserver.c b/webcit/webserver.c
index db3a01aa9..509d128f7 100644
--- a/webcit/webserver.c
+++ b/webcit/webserver.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996-2013 by the citadel.org team
+ * Copyright (c) 1996-2014 by the citadel.org team
  *
  * This program is open source software.  You can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 3.
@@ -229,7 +229,7 @@ int main(int argc, char **argv)
 
 	/* Tell 'em who's in da house */
 	syslog(LOG_NOTICE, "%s", PACKAGE_STRING);
-	syslog(LOG_NOTICE, "Copyright (C) 1996-2013 by the citadel.org team");
+	syslog(LOG_NOTICE, "Copyright (C) 1996-2014 by the citadel.org team");
 	syslog(LOG_NOTICE, " ");
 	syslog(LOG_NOTICE, "This program is open source software: you can redistribute it and/or");
 	syslog(LOG_NOTICE, "modify it under the terms of the GNU General Public License, version 3.");