X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=LICENSE;h=43dc17aba6fc64071614336a85594a6ad43f24cc;hb=refs%2Fheads%2FRADSECPROXY-51;hp=c17867b2ea1e87e7f5c214ae5c49d1a5e54f11f8;hpb=4ac1be684f61dd1f1b3560a8f5a04c8f2dff1bc5;p=radsecproxy.git

diff --git a/LICENSE b/LICENSE
index c17867b..43dc17a 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,13 +1,7 @@
-The radsecproxy source code is subject to two licenses, you may pick
-the one that best suits your needs.
+Radsecproxy is distributed under this license:
 
-The radsecproxy source code is subject to the terms of the GNU General
-Public License Version 2 or later (GPL).
-
-Alternatively the radsecproxy source code is subject to the terms of the
-below BSD style license.
-
-* Copyright (c) 2006-2009, UNINETT AS
+* Copyright (c) 2007-2010, UNINETT AS
+* Copyright (c) 2010-2012, NORDUnet A/S
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -17,14 +11,15 @@ below BSD style license.
 *     * Redistributions in binary form must reproduce the above copyright
 *       notice, this list of conditions and the following disclaimer in the
 *       documentation and/or other materials provided with  distribution.
-*     * Neither the name of the UNINETT AS nor the names of its
-*       contributors may be used to endorse or promote products derived
-*       from this software without specific prior written permission.
+*     * Neither the name of NORDUnet A/S nor the names of its
+*       contributors may be used to endorse or promote products
+*       derived from this software without specific prior written
+*       permission.
 *
-* THIS SOFTWARE IS PROVIDED BY UNINETT AS ``AS IS'' AND ANY
+* THIS SOFTWARE IS PROVIDED BY NORDUNET AS ``AS IS'' AND ANY
 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL UNINETT AS BE LIABLE FOR ANY
+* DISCLAIMED. IN NO EVENT SHALL NORDUNET AS BE LIABLE FOR ANY
 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND