Merge branch 'licensing-nogpl'

Conflicts:
	configure.ac

1 files changed, 3 insertions, 3 deletions

diff --git a/main.c b/main.c
index e2ed409..9787d1e 100644
--- a/main.c
+++ b/main.c
@@ -1,6 +1,6 @@
-/* Copyright (C) 2011 NORDUnet A/S
- * See LICENSE for information about licensing.
- */
+/* Copyright (c) 2006-2010, UNINETT AS
+ * Copyright (c) 2010-2012, NORDUnet A/S */
+/* See LICENSE for licensing information. */
 
 int radsecproxy_main(int argc, char **argv);