Merge branch 'licensing-nogpl'

Conflicts:
	configure.ac

diff --cc configure.ac
index 9ba93f5,4326ecc..e5df020
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -1,4 -1,8 +1,8 @@@
 -AC_INIT(radsecproxy, 1.6.1-dev, radsecproxy@uninett.no)
+ dnl Copyright (c) 2006-2010, UNINETT AS
+ dnl Copyright (c) 2010-2012, NORDUnet A/S
+ dnl See LICENSE for licensing information.
+ 
 +AC_INIT(radsecproxy, 1.7-dev, radsecproxy@uninett.no)
  AC_CANONICAL_TARGET
  AM_INIT_AUTOMAKE
  AC_PROG_CC

diff --cc dtls.c
Simple merge