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

[citadel.git] / citadel / control.h

diff --git a/citadel/control.h b/citadel/control.h
index 5719a92dcd50e4a878ce2d2554a7b3dde9e8fa2f..c08f4f26684f082f641862e04c0d11d796367d16 100644 (file)
--- a/citadel/control.h
+++ b/citadel/control.h
@@ -1,20 +1,13 @@
-/* $Id$
+/*
+ * Copyright (c) 1987-2012 by the citadel.org team
  *
- * Copyright (c) 1987-2009 by the citadel.org team
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
+ *  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.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 void get_control (void);